Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-01-04 18:15:09 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-01-04 18:15:09 +0300
commitd19a19ce85fe06bef4cea7c0f4415979086b4305 (patch)
tree51d6a1ce734ddac0c37466f9a6a21409fea7ec96 /spec/spec_helper.rb
parent76893705a1df96909da44ab3c99816fd12129206 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/spec_helper.rb')
-rw-r--r--spec/spec_helper.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index c497f8245fe..a2f4236b3ed 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -463,6 +463,14 @@ RSpec.configure do |config|
$stdout = STDOUT
end
+ config.around(:each, stubbing_settings_source: true) do |example|
+ original_instance = ::Settings.instance_variable_get(:@instance)
+
+ example.run
+
+ ::Settings.instance_variable_set(:@instance, original_instance)
+ end
+
config.disable_monkey_patching!
end