diff options
| author | Regis <boudinot.regis@yahoo.com> | 2017-01-25 14:01:44 -0700 |
|---|---|---|
| committer | Regis <boudinot.regis@yahoo.com> | 2017-01-25 14:01:44 -0700 |
| commit | d4b2f4dd8332701c2df0003a213b34abe0163599 (patch) | |
| tree | ec868cb769c6656bbcb4b42b65710ab72717598e /spec/controllers | |
| parent | 5348985015cd0f3163ed7617eb86df63396db16b (diff) | |
| parent | 112f9710b65fe830a058366cde1734a2928764de (diff) | |
| download | gitlab-ce-pipeline_index_vue_error_state.tar.gz | |
Merge branch 'master' into pipeline_index_vue_error_statepipeline_index_vue_error_state
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 |