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:
authorRémy Coutable <remy@rymai.me>2018-12-17 12:47:48 +0300
committerRémy Coutable <remy@rymai.me>2018-12-17 12:47:48 +0300
commitd8c425227320d8b4ca2e5b31125a236889d72043 (patch)
treeaacebe81332dd6106f61fb8277e829f9312c7c82 /spec/spec_helper.rb
parent8b4602041cf2c4a8738a4796d78720017249249f (diff)
parentdb267fa31bcbf991a2efb932b85a8935a13b0941 (diff)
Merge branch 'fix-rspec-offcense' into 'master'
Fix RSpec/HookArgument rubocop offense See merge request gitlab-org/gitlab-ce!23776
Diffstat (limited to 'spec/spec_helper.rb')
-rw-r--r--spec/spec_helper.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index cd69160be10..fb3421b61d3 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -115,7 +115,7 @@ RSpec.configure do |config|
TestEnv.clean_test_path
end
- config.before(:example) do
+ config.before do
# Enable all features by default for testing
allow(Feature).to receive(:enabled?) { true }
@@ -136,11 +136,11 @@ RSpec.configure do |config|
RequestStore.clear!
end
- config.after(:example) do
+ config.after do
Fog.unmock! if Fog.mock?
end
- config.after(:example) do
+ config.after do
Gitlab::CurrentSettings.clear_in_memory_application_settings!
end