summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-06-12 15:41:10 +0000
committerRobert Speicher <robert@gitlab.com>2017-06-12 15:41:10 +0000
commitde23d651e0a6b31b21c416c073ddf9e8ff97ade5 (patch)
treece596a49f5ae12fb137e6703a75f9cdaf6b788a6
parent6bea29649e1a660a6298f4e304806192544c0ed3 (diff)
parent3a33665c9cb768584ce6296b3bacf34a285e0ccb (diff)
downloadgitlab-ce-de23d651e0a6b31b21c416c073ddf9e8ff97ade5.tar.gz
Merge branch 'retry-specs' into 'master'
Attempts to run RSpec tests twice (1 retry) See merge request !12066
-rw-r--r--spec/spec_helper.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 110428da794..1979347a178 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -84,9 +84,8 @@ RSpec.configure do |config|
end
if ENV['CI']
- # Retry only on feature specs that use JS
- config.around :each, :js do |ex|
- ex.run_with_retry retry: 3
+ config.around(:each) do |ex|
+ ex.run_with_retry retry: 2
end
end