From d19a19ce85fe06bef4cea7c0f4415979086b4305 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 4 Jan 2022 15:15:09 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/spec_helper.rb | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'spec/spec_helper.rb') 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 -- cgit v1.2.3