diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-08-05 11:46:33 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-08-05 11:46:33 +0300 |
| commit | e6a05e5a63b3b336179a4ed67df76ba7ad08fadb (patch) | |
| tree | 1358a0ce408e5656051ae9ecc0bb894948f5dcbb /spec | |
| parent | 1ca5e1186d4bfeaa61b065f23419e640e4e52af3 (diff) | |
| parent | 8f653f098394d3f048c0abdecda2a0de54b48e08 (diff) | |
Merge branch 'tc-reanble-running-quarantined-specs' into 'master'
Again run quarantine specs if tag provided
See merge request gitlab-org/gitlab-ce!31414
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/spec_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 6994b6687fc..bcc133790d1 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -148,9 +148,9 @@ RSpec.configure do |config| Gitlab::ThreadMemoryCache.cache_backend.clear end - config.around(:example, :quarantine) do + config.around(:example, :quarantine) do |example| # Skip tests in quarantine unless we explicitly focus on them. - skip('In quarantine') unless config.inclusion_filter[:quarantine] + example.run if config.inclusion_filter[:quarantine] end config.before(:example, :request_store) do |