Merge branch…

Merge branch '45278-failing-current_settings_spec-rb-on-master-when-env-in_memory_application_settings-is-true-returns-an-in-memory-applicationsetting-object' into 'master' Resolve "Failing current_settings_spec.rb on master (when ENV["IN_MEMORY_APPLICATION_SETTINGS"] is true returns an in-memory ApplicationSetting object)" Closes #45278 See merge request gitlab-org/gitlab-ce!18388

Merge branch…
bcaba662 · Sean McGivern · 551f146e · 4dbc309b · bcaba662
Commit bcaba662 authored Apr 16, 2018 by Sean McGivern
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

settings_spec.rb spec/db/production/settings_spec.rb +6 -1

No files found.
--- a/spec/db/production/settings_spec.rb
+++ b/spec/db/production/settings_spec.rb
@@ -2,10 +2,15 @@ require 'spec_helper'
 require 'rainbow/ext/string'

 describe 'seed production settings' do
-  include StubENV
  let(:settings_file) { Rails.root.join('db/fixtures/production/010_settings.rb') }
  let(:settings) { Gitlab::CurrentSettings.current_application_settings }

+  before do
+    # It's important to set this variable so that we don't save a memoized
+    # (supposed to be) in-memory record in `Gitlab::CurrentSettings.in_memory_application_settings`
+    stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false')
+  end
+
  context 'GITLAB_SHARED_RUNNERS_REGISTRATION_TOKEN is set in the environment' do
    before do
      stub_env('GITLAB_SHARED_RUNNERS_REGISTRATION_TOKEN', '013456789')