diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-01-22 00:11:19 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-01-23 16:35:24 +0100 |
| commit | 632c2939bb1e9d10b5e9be05bc4692d92f9f5f32 (patch) | |
| tree | b56bf9a5fb3665fc38cdf5fa0b1e5739983a3bdb /spec/controllers | |
| parent | 6c65f7a7ce52fadcf53ea2395103de32b0107874 (diff) | |
| download | gitlab-ce-632c2939bb1e9d10b5e9be05bc4692d92f9f5f32.tar.gz | |
Revert "Merge branch 'revert-9cac0317' into 'master'
"
This reverts commit c20934869f7dc8cfbdbafb6ecb7b1305452c9e8a, reversing
changes made to 4b7ec44b91e0571d209c790d54947ba1756dac0e.
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 |