summaryrefslogtreecommitdiff
path: root/spec/spec_helper.rb
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-11-18 15:49:19 +0000
committerFatih Acet <acetfatih@gmail.com>2016-11-18 15:49:19 +0000
commit1e8cb595bf2fc84c85198cf8dc43d16e587c57df (patch)
tree55b8133e3054d9a35691209da71551c360a357c1 /spec/spec_helper.rb
parentc55733bc5058b793389101cce47b9b5807d73fd0 (diff)
parent9ed7171a6a8c98858949891b298789a97c4f3fba (diff)
downloadgitlab-ce-1e8cb595bf2fc84c85198cf8dc43d16e587c57df.tar.gz
Merge branch '23205-information-about-environments-build-page' into 'master'
Add environment info to builds page ![Screen_Shot_2016-11-02_at_5.44.01_PM](/uploads/3443d9518997147d1e6f41830e3774ff/Screen_Shot_2016-11-02_at_5.44.01_PM.png) Closes #23205 See merge request !7251
Diffstat (limited to 'spec/spec_helper.rb')
-rw-r--r--spec/spec_helper.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 73cf4c9a24c..bead1a006d1 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -26,10 +26,11 @@ RSpec.configure do |config|
config.verbose_retry = true
config.display_try_failure_messages = true
- config.include Devise::Test::ControllerHelpers, type: :controller
+ config.include Devise::Test::ControllerHelpers, type: :controller
+ config.include Devise::Test::ControllerHelpers, type: :view
config.include Warden::Test::Helpers, type: :request
- config.include LoginHelpers, type: :feature
- config.include SearchHelpers, type: :feature
+ config.include LoginHelpers, type: :feature
+ config.include SearchHelpers, type: :feature
config.include StubConfiguration
config.include EmailHelpers
config.include TestEnv