summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2019-05-10 17:29:15 +0000
committerLin Jen-Shin <godfat@godfat.org>2019-05-10 17:29:15 +0000
commit4828ef52edee8d23ce564e9d3fe91bdb187a73e3 (patch)
treebbf02da75509f35c26d5c16bf69b890e64abd769
parent3f29c2b593f12259b79c682a84c513b68f20c7cb (diff)
parentf59438c0a9da7bb4d98291d2adedfc5a13a50798 (diff)
downloadgitlab-ce-4828ef52edee8d23ce564e9d3fe91bdb187a73e3.tar.gz
Merge branch 'avoid-unrelated-errors-in-quarantined-specs' into 'master'
Fix unrelated errors when teardowning quanrantined specs See merge request gitlab-org/gitlab-ce!28240
-rw-r--r--spec/spec_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 9266bee34d6..69589c9aa33 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -138,7 +138,7 @@ RSpec.configure do |config|
.and_return(false)
end
- config.before(:example, :quarantine) do
+ config.around(:example, :quarantine) do
# Skip tests in quarantine unless we explicitly focus on them.
skip('In quarantine') unless config.inclusion_filter[:quarantine]
end