From 87274bccc61f5947ee96fcf75f5c6443a087ddde Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Mon, 5 Sep 2022 16:29:27 +1000
Subject: [PATCH] Remove retries from test runs

If a spec is flaky, we need to fix it. Retry is just hiding problems for
a while and is adding to execution time.
---
 .github/workflows/build.yml | 1 -
 Gemfile                     | 1 -
 Gemfile.lock                | 3 ---
 spec/base_spec_helper.rb    | 6 ------
 4 files changed, 11 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 774d01ab96..5da8c4c05d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,7 +9,6 @@ env:
   DISABLE_KNAPSACK: true
   TIMEZONE: UTC
   COVERAGE: true
-  RSPEC_RETRY_RETRY_COUNT: 3
   RAILS_ENV: test
 
 permissions:
diff --git a/Gemfile b/Gemfile
index 316873f9bd..b190dbd209 100644
--- a/Gemfile
+++ b/Gemfile
@@ -150,7 +150,6 @@ group :test, :development do
   gem 'knapsack'
   gem 'letter_opener', '>= 1.4.1'
   gem 'rspec-rails', ">= 3.5.2"
-  gem 'rspec-retry'
   gem 'rswag-specs'
   gem 'shoulda-matchers'
   gem 'timecop'
diff --git a/Gemfile.lock b/Gemfile.lock
index 7dae94482a..cafdcb54eb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -547,8 +547,6 @@ 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.10.3)
     rswag-api (2.6.0)
       railties (>= 3.1, < 7.1)
@@ -798,7 +796,6 @@ DEPENDENCIES
   roadie-rails
   roo
   rspec-rails (>= 3.5.2)
-  rspec-retry
   rswag-api
   rswag-specs
   rswag-ui
diff --git a/spec/base_spec_helper.rb b/spec/base_spec_helper.rb
index 832c4da714..376299828a 100644
--- a/spec/base_spec_helper.rb
+++ b/spec/base_spec_helper.rb
@@ -12,7 +12,6 @@ require 'view_component/test_helpers'
 require_relative "../config/environment"
 require 'rspec/rails'
 require 'capybara'
-require 'rspec/retry'
 require 'paper_trail/frameworks/rspec'
 require "factory_bot_rails"
 
@@ -59,11 +58,6 @@ RSpec.configure do |config|
   # rspec-rails.
   config.infer_base_class_for_anonymous_controllers = false
 
-  # Show retries in test output
-  config.verbose_retry = true
-  # Set maximum retry count
-  config.default_retry_count = 0
-
   # Force colored output, whether or not the output is a TTY
   config.color_mode = :on