diff --git a/Gemfile b/Gemfile index bb641fc..8450e3b 100644 --- a/Gemfile +++ b/Gemfile @@ -14,6 +14,7 @@ group :development, :test do gem 'cuprite' gem 'rspec_junit_formatter' gem 'rspec-rails' + gem 'rspec-retry' # Linters gem 'fasterer' diff --git a/gemfiles/rails52_activeadmin20.gemfile b/gemfiles/rails52_activeadmin20.gemfile index abf7395..c0af10f 100644 --- a/gemfiles/rails52_activeadmin20.gemfile +++ b/gemfiles/rails52_activeadmin20.gemfile @@ -13,6 +13,7 @@ group :development, :test do gem "cuprite" gem "rspec_junit_formatter" gem "rspec-rails" + gem "rspec-retry" gem "fasterer" gem "rubocop" gem "rubocop-packaging" diff --git a/gemfiles/rails52_activeadmin20.gemfile.lock b/gemfiles/rails52_activeadmin20.gemfile.lock index c25b6a0..962db24 100644 --- a/gemfiles/rails52_activeadmin20.gemfile.lock +++ b/gemfiles/rails52_activeadmin20.gemfile.lock @@ -220,6 +220,8 @@ GEM rspec-expectations (~> 3.10) rspec-mocks (~> 3.10) rspec-support (~> 3.10) + rspec-retry (0.6.2) + rspec-core (> 3.3) rspec-support (3.11.0) rspec_junit_formatter (0.5.1) rspec-core (>= 2, < 4, != 2.12.0) @@ -295,6 +297,7 @@ DEPENDENCIES puma rails (~> 5.2.0) rspec-rails + rspec-retry rspec_junit_formatter rubocop rubocop-packaging diff --git a/gemfiles/rails60_activeadmin.gemfile b/gemfiles/rails60_activeadmin.gemfile index 928f2e4..288d046 100644 --- a/gemfiles/rails60_activeadmin.gemfile +++ b/gemfiles/rails60_activeadmin.gemfile @@ -14,6 +14,7 @@ group :development, :test do gem "cuprite" gem "rspec_junit_formatter" gem "rspec-rails" + gem "rspec-retry" gem "fasterer" gem "rubocop" gem "rubocop-packaging" diff --git a/gemfiles/rails60_activeadmin.gemfile.lock b/gemfiles/rails60_activeadmin.gemfile.lock index 3647b97..956104a 100644 --- a/gemfiles/rails60_activeadmin.gemfile.lock +++ b/gemfiles/rails60_activeadmin.gemfile.lock @@ -225,6 +225,8 @@ GEM rspec-expectations (~> 3.10) rspec-mocks (~> 3.10) rspec-support (~> 3.10) + rspec-retry (0.6.2) + rspec-core (> 3.3) rspec-support (3.11.0) rspec_junit_formatter (0.5.1) rspec-core (>= 2, < 4, != 2.12.0) @@ -297,6 +299,7 @@ DEPENDENCIES puma rails (~> 6.0.0) rspec-rails + rspec-retry rspec_junit_formatter rubocop rubocop-packaging diff --git a/gemfiles/rails60_activeadmin22.gemfile b/gemfiles/rails60_activeadmin22.gemfile index 9406cc1..da0d476 100644 --- a/gemfiles/rails60_activeadmin22.gemfile +++ b/gemfiles/rails60_activeadmin22.gemfile @@ -14,6 +14,7 @@ group :development, :test do gem "cuprite" gem "rspec_junit_formatter" gem "rspec-rails" + gem "rspec-retry" gem "fasterer" gem "rubocop" gem "rubocop-packaging" diff --git a/gemfiles/rails60_activeadmin22.gemfile.lock b/gemfiles/rails60_activeadmin22.gemfile.lock index dfe6daf..33b0dbe 100644 --- a/gemfiles/rails60_activeadmin22.gemfile.lock +++ b/gemfiles/rails60_activeadmin22.gemfile.lock @@ -233,6 +233,8 @@ GEM rspec-expectations (~> 3.10) rspec-mocks (~> 3.10) rspec-support (~> 3.10) + rspec-retry (0.6.2) + rspec-core (> 3.3) rspec-support (3.11.0) rspec_junit_formatter (0.5.1) rspec-core (>= 2, < 4, != 2.12.0) @@ -316,6 +318,7 @@ DEPENDENCIES puma rails (~> 6.0.0) rspec-rails + rspec-retry rspec_junit_formatter rubocop rubocop-packaging diff --git a/gemfiles/rails61_activeadmin.gemfile b/gemfiles/rails61_activeadmin.gemfile index f64b04e..184df44 100644 --- a/gemfiles/rails61_activeadmin.gemfile +++ b/gemfiles/rails61_activeadmin.gemfile @@ -13,6 +13,7 @@ group :development, :test do gem "cuprite" gem "rspec_junit_formatter" gem "rspec-rails" + gem "rspec-retry" gem "fasterer" gem "rubocop" gem "rubocop-packaging" diff --git a/gemfiles/rails61_activeadmin.gemfile.lock b/gemfiles/rails61_activeadmin.gemfile.lock index faf1426..492cc08 100644 --- a/gemfiles/rails61_activeadmin.gemfile.lock +++ b/gemfiles/rails61_activeadmin.gemfile.lock @@ -228,6 +228,8 @@ GEM rspec-expectations (~> 3.10) rspec-mocks (~> 3.10) rspec-support (~> 3.10) + rspec-retry (0.6.2) + rspec-core (> 3.3) rspec-support (3.11.0) rspec_junit_formatter (0.5.1) rspec-core (>= 2, < 4, != 2.12.0) @@ -294,6 +296,7 @@ DEPENDENCIES puma rails (~> 6.1.0) rspec-rails + rspec-retry rspec_junit_formatter rubocop rubocop-packaging diff --git a/gemfiles/rails61_activeadmin29.gemfile b/gemfiles/rails61_activeadmin29.gemfile index 6cc8517..ef2dbe8 100644 --- a/gemfiles/rails61_activeadmin29.gemfile +++ b/gemfiles/rails61_activeadmin29.gemfile @@ -13,6 +13,7 @@ group :development, :test do gem "cuprite" gem "rspec_junit_formatter" gem "rspec-rails" + gem "rspec-retry" gem "fasterer" gem "rubocop" gem "rubocop-packaging" diff --git a/gemfiles/rails61_activeadmin29.gemfile.lock b/gemfiles/rails61_activeadmin29.gemfile.lock index 6394487..9e6e9dd 100644 --- a/gemfiles/rails61_activeadmin29.gemfile.lock +++ b/gemfiles/rails61_activeadmin29.gemfile.lock @@ -228,6 +228,8 @@ GEM rspec-expectations (~> 3.10) rspec-mocks (~> 3.10) rspec-support (~> 3.10) + rspec-retry (0.6.2) + rspec-core (> 3.3) rspec-support (3.11.0) rspec_junit_formatter (0.5.1) rspec-core (>= 2, < 4, != 2.12.0) @@ -294,6 +296,7 @@ DEPENDENCIES puma rails (~> 6.1.0) rspec-rails + rspec-retry rspec_junit_formatter rubocop rubocop-packaging diff --git a/gemfiles/rails70_activeadmin.gemfile b/gemfiles/rails70_activeadmin.gemfile index 4674116..0e673ab 100644 --- a/gemfiles/rails70_activeadmin.gemfile +++ b/gemfiles/rails70_activeadmin.gemfile @@ -14,6 +14,7 @@ group :development, :test do gem "cuprite" gem "rspec_junit_formatter" gem "rspec-rails" + gem "rspec-retry" gem "fasterer" gem "rubocop" gem "rubocop-packaging" diff --git a/gemfiles/rails70_activeadmin.gemfile.lock b/gemfiles/rails70_activeadmin.gemfile.lock index 4a6a62b..20d8aba 100644 --- a/gemfiles/rails70_activeadmin.gemfile.lock +++ b/gemfiles/rails70_activeadmin.gemfile.lock @@ -251,6 +251,8 @@ GEM rspec-expectations (~> 3.10) rspec-mocks (~> 3.10) rspec-support (~> 3.10) + rspec-retry (0.6.2) + rspec-core (> 3.3) rspec-support (3.11.0) rspec_junit_formatter (0.5.1) rspec-core (>= 2, < 4, != 2.12.0) @@ -319,6 +321,7 @@ DEPENDENCIES puma rails (~> 7.0.0) rspec-rails + rspec-retry rspec_junit_formatter rubocop rubocop-packaging diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index b948026..5ab7b81 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -10,6 +10,7 @@ abort('The Rails environment is running in production mode!') if Rails.env.produ require 'rspec/rails' require 'capybara/rails' +require 'rspec/retry' Dir[File.expand_path('support/**/*.rb', __dir__)].sort.each { |f| require f } @@ -34,6 +35,8 @@ RSpec.configure do |config| config.use_instantiated_fixtures = false config.render_views = false + config.default_retry_count = 2 + config.before(:suite) do intro = ('-' * 80) intro << "\n" diff --git a/spec/support/capybara_cuprite.rb b/spec/support/capybara_cuprite.rb index e607dba..0db5cd8 100644 --- a/spec/support/capybara_cuprite.rb +++ b/spec/support/capybara_cuprite.rb @@ -14,9 +14,9 @@ Capybara.register_driver(:cuprite) do |app| # See additional options for Dockerized environment in the respective section of this article browser_options: browser_options, # Increase Chrome startup wait time (required for stable CI builds) - process_timeout: 30, + process_timeout: 20, # The number of seconds we'll wait for a response when communicating with browser. Default is 5 - timeout: 30, + timeout: 20, # Enable debugging capabilities inspector: true, # Allow running Chrome in a headful mode by setting HEADLESS env var to a falsey value