diff options
author | Robert Speicher <robert@gitlab.com> | 2017-01-24 19:14:14 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2017-01-24 19:14:14 +0000 |
commit | 94cc7cfad25f2c28bd4db8ca1fd39ece98c206b4 (patch) | |
tree | 04b1d6471e4c9f00419b7b8358b9f5b9e4a1a959 /spec/controllers | |
parent | 8c9a06c37c4cf9763b3781d7e567a7b442c2152c (diff) | |
parent | 765d57d6505b7fbd2542ee957d85399ebc74ba70 (diff) | |
download | gitlab-ce-94cc7cfad25f2c28bd4db8ca1fd39ece98c206b4.tar.gz |
Merge branch 'dont-persist-application-settings-in-test-env-bis' into 'master'
Dont persist application settings in test env
See merge request !8715
Diffstat (limited to 'spec/controllers')
-rw-r--r-- | spec/controllers/health_check_controller_spec.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/spec/controllers/health_check_controller_spec.rb b/spec/controllers/health_check_controller_spec.rb index 56ecf2bb644..cfe18dd4b6c 100644 --- a/spec/controllers/health_check_controller_spec.rb +++ b/spec/controllers/health_check_controller_spec.rb @@ -1,10 +1,16 @@ require 'spec_helper' describe HealthCheckController do + include StubENV + let(:token) { current_application_settings.health_check_access_token } let(:json_response) { JSON.parse(response.body) } let(:xml_response) { Hash.from_xml(response.body)['hash'] } + before do + stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false') + end + describe 'GET #index' do context 'when services are up but NO access token' do it 'returns a not found page' do |