diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-16 18:10:18 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-16 18:10:18 +0300 |
| commit | 6364c14cc1f445d471bca118dca5af5a85b2c5dc (patch) | |
| tree | 2579c5592f207e86ff7a0c5c7499caad723cdec1 /spec/spec_helper.rb | |
| parent | 5a2284f3500088e04cf3a5854fb06dc9db2b6077 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 93867ef2990..c19c26f9a0b 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -142,7 +142,9 @@ RSpec.configure do |config| config.include TestEnv config.include FileReadHelpers config.include Devise::Test::ControllerHelpers, type: :controller + config.include Devise::Test::ControllerHelpers, type: :view config.include Devise::Test::IntegrationHelpers, type: :feature + config.include Devise::Test::IntegrationHelpers, type: :request config.include LoginHelpers, type: :feature config.include SearchHelpers, type: :feature config.include WaitHelpers, type: :feature @@ -150,7 +152,6 @@ RSpec.configure do |config| config.include EmailHelpers, :mailer, type: :mailer config.include Warden::Test::Helpers, type: :request config.include Gitlab::Routing, type: :routing - config.include Devise::Test::ControllerHelpers, type: :view config.include ApiHelpers, :api config.include CookieHelper, :js config.include InputHelper, :js |