5883ce95ef
The initializers including this were doing so at the top level, so every object loaded after them had a `current_application_settings` method. However, if someone had rack-attack enabled (which was loaded before these initializers), it would try to load the API, and fail, because `Gitlab::CurrentSettings` didn't have that method. To fix this: 1. Don't include `Gitlab::CurrentSettings` at the top level. We do not need `Object.new.current_application_settings` to work. 2. Make `Gitlab::CurrentSettings` explicitly `extend self`, as we already use it like that in several places. 3. Change the initializers to use that new form.
35 lines
908 B
Ruby
35 lines
908 B
Ruby
# Inspired by https://github.com/ljkbennett/stub_env/blob/master/lib/stub_env/helpers.rb
|
|
module StubENV
|
|
include Gitlab::CurrentSettings
|
|
|
|
def stub_env(key_or_hash, value = nil)
|
|
init_stub unless env_stubbed?
|
|
if key_or_hash.is_a? Hash
|
|
key_or_hash.each { |k, v| add_stubbed_value(k, v) }
|
|
else
|
|
add_stubbed_value key_or_hash, value
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
STUBBED_KEY = '__STUBBED__'.freeze
|
|
|
|
def add_stubbed_value(key, value)
|
|
allow(ENV).to receive(:[]).with(key).and_return(value)
|
|
allow(ENV).to receive(:fetch).with(key).and_return(value)
|
|
allow(ENV).to receive(:fetch).with(key, anything()) do |_, default_val|
|
|
value || default_val
|
|
end
|
|
end
|
|
|
|
def env_stubbed?
|
|
ENV[STUBBED_KEY]
|
|
end
|
|
|
|
def init_stub
|
|
allow(ENV).to receive(:[]).and_call_original
|
|
allow(ENV).to receive(:fetch).and_call_original
|
|
add_stubbed_value(STUBBED_KEY, true)
|
|
end
|
|
end
|