diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-01-20 18:42:54 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-01-20 18:42:54 +0300 |
| commit | 9cac0317696cf47beb77bab28a914411b09ff26c (patch) | |
| tree | a149c8d9130a1ec3fbcb7284f42ae7ad965ca5fc /spec/controllers | |
| parent | 029b9019167b3a67e628e609f2cc141052a99a98 (diff) | |
| parent | f6cc29ed83921c3dce98d8c519c4826e7cc8221a (diff) | |
Merge branch 'dont-persist-application-settings-in-test-env' into 'master'
Don't persist application settings in test env
See merge request !8573
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 |