Commit 1bac28d0 authored by Stan Hu's avatar Stan Hu

Stub Rails.application.env_config to prevent spec failures

When we modify env_config, that is on the global Rails.application, and
we need to stub it and allow it to be modified in-place, without
polluting later tests.

When we modify env, then the context is a request, or something else
that only lives for a single spec.

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/8488
parent e2aa2177
...@@ -8,8 +8,15 @@ module DeviseHelpers ...@@ -8,8 +8,15 @@ module DeviseHelpers
end end
def env_from_context(context) def env_from_context(context)
# When we modify env_config, that is on the global
# Rails.application, and we need to stub it and allow it to be
# modified in-place, without polluting later tests.
if context.respond_to?(:env_config) if context.respond_to?(:env_config)
context.env_config context.env_config.deep_dup.tap do |env|
allow(context).to receive(:env_config).and_return(env)
end
# When we modify env, then the context is a request, or something
# else that only lives for a single spec.
elsif context.respond_to?(:env) elsif context.respond_to?(:env)
context.env context.env
end end
......
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