Commit bcaba662 authored by Sean McGivern's avatar Sean McGivern

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
parents 551f146e 4dbc309b
......@@ -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`
context 'GITLAB_SHARED_RUNNERS_REGISTRATION_TOKEN is set in the environment' do
before do
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment