Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2017-01-22 01:55:35 +0300
committerGrzegorz Bizon <grzegorz@gitlab.com>2017-01-22 01:55:35 +0300
commitbaeaa97ef49558a303b0bd7b6cc9ce4ccfc13d1d (patch)
treec009601bc21af2f88f0d246427d5fbe3db5e5bb2 /spec/controllers/health_check_controller_spec.rb
parentf6f52b43b59641f5e0c6f7aa47b1354ca3aeee32 (diff)
Revert "Merge branch 'dont-persist-application-settings-in-test-env' into 'master'"
This reverts merge request !8573
Diffstat (limited to 'spec/controllers/health_check_controller_spec.rb')
-rw-r--r--spec/controllers/health_check_controller_spec.rb6
1 files changed, 0 insertions, 6 deletions
diff --git a/spec/controllers/health_check_controller_spec.rb b/spec/controllers/health_check_controller_spec.rb
index cfe18dd4b6c..56ecf2bb644 100644
--- a/spec/controllers/health_check_controller_spec.rb
+++ b/spec/controllers/health_check_controller_spec.rb
@@ -1,16 +1,10 @@
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