diff options
author | Steve Azzopardi <sazzopardi@gitlab.com> | 2018-11-20 08:23:36 +0000 |
---|---|---|
committer | Steve Azzopardi <steveazz@outlook.com> | 2018-11-20 09:37:43 +0100 |
commit | 25493e2b85cf826a86686cc8001a1aa65487bee8 (patch) | |
tree | fd3b72cfafcbfe053e755b37980f0f185e7e71e4 | |
parent | fc20b5feab8a206f520c2c9cbc1bf4cba6610172 (diff) | |
download | gitlab-ce-25493e2b85cf826a86686cc8001a1aa65487bee8.tar.gz |
Merge branch 'sh-fix-issue-8448-ce' into 'master'
Stub Rails.application.env_config to prevent spec failures
Closes gitlab-ee#8488
See merge request gitlab-org/gitlab-ce!23222
-rw-r--r-- | spec/support/helpers/devise_helpers.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/spec/support/helpers/devise_helpers.rb b/spec/support/helpers/devise_helpers.rb index 66874e10f38..d32bc2424c0 100644 --- a/spec/support/helpers/devise_helpers.rb +++ b/spec/support/helpers/devise_helpers.rb @@ -8,8 +8,15 @@ module DeviseHelpers end 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) - 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) context.env end |