summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-03-28 09:51:29 +0000
committerRémy Coutable <remy@rymai.me>2018-03-28 09:51:29 +0000
commit3515be7bb09fa622118d7d81c5bbb556b9a6d5a5 (patch)
tree530c48772e242e27ec0a022e1e6021569d709eeb
parentc9a4bd244dd3d228510827a069a0c6356c5b6dbe (diff)
parentd7dc9ad154b2589b6a1b702d76d29be4480d1211 (diff)
downloadgitlab-ce-3515be7bb09fa622118d7d81c5bbb556b9a6d5a5.tar.gz
Merge branch 'tc-sh-fix-issue-5461-ce' into 'master'
Clean the test path after each spec run See merge request gitlab-org/gitlab-ce!18035
-rw-r--r--spec/spec_helper.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 5051cd34564..e8cecf361ff 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -97,6 +97,10 @@ RSpec.configure do |config|
TestEnv.init
end
+ config.after(:all) do
+ TestEnv.clean_test_path
+ end
+
config.before(:example) do
# Skip pre-receive hook check so we can use the web editor and merge.
allow_any_instance_of(Gitlab::Git::Hook).to receive(:trigger).and_return([true, nil])