Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-09-18 21:10:26 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-18 21:10:26 +0300
commit96c78a921fc87226239fe6a8ea89a518731dc152 (patch)
tree8cfb6d13c61d859eab529a2ad75b0603f7e1b78f /spec/spec_helper.rb
parent80d252c8e25dc88023e750cf2a22be6186cfd6aa (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/spec_helper.rb')
-rw-r--r--spec/spec_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 11a83bd9501..6ddced09699 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -124,6 +124,7 @@ RSpec.configure do |config|
config.include LoginHelpers, type: :feature
config.include SearchHelpers, type: :feature
config.include WaitHelpers, type: :feature
+ config.include WaitForRequests, type: :feature
config.include EmailHelpers, :mailer, type: :mailer
config.include Warden::Test::Helpers, type: :request
config.include Gitlab::Routing, type: :routing
@@ -133,7 +134,6 @@ RSpec.configure do |config|
config.include InputHelper, :js
config.include SelectionHelper, :js
config.include InspectRequests, :js
- config.include WaitForRequests, :js
config.include LiveDebugger, :js
config.include MigrationsHelpers, :migration
config.include RedisHelpers