From bec4ece0797b8f08d28616c0a571af0096f680e6 Mon Sep 17 00:00:00 2001
From: James Ebentier <jebentier@invoca.com>
Date: Tue, 4 Feb 2025 18:01:10 +0100
Subject: [PATCH] TECH-17399: switch out rr for rspec-mocks

---
 Gemfile                    |  3 ++-
 Gemfile.lock               | 12 ++++++++++--
 gemfiles/rails_6_0.gemfile |  3 ++-
 gemfiles/rails_6_1.gemfile |  3 ++-
 gemfiles/rails_7_0.gemfile |  3 ++-
 gemfiles/rails_7_1.gemfile |  3 ++-
 gemfiles/rails_7_2.gemfile |  3 ++-
 gemfiles/rails_8_0.gemfile |  3 ++-
 test/test_helper.rb        |  3 ++-
 9 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/Gemfile b/Gemfile
index eb5f52c..af4e2f9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,7 +10,8 @@ gem 'minitest', '~> 5.1'
 gem 'minitest-reporters'
 gem 'mysql2'
 gem 'pry'
-gem 'rr', '~> 1.1'
+gem 'rspec-expectations'
+gem 'rspec-mocks'
 gem 'rubocop', require: false
 gem 'rubocop-minitest', require: false
 gem 'rubocop-rails', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 63140a7..4f26f0a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -82,6 +82,7 @@ GEM
     concurrent-ruby (1.3.4)
     crass (1.0.6)
     date (3.3.3)
+    diff-lcs (1.5.1)
     erubi (1.12.0)
     globalid (1.1.0)
       activesupport (>= 5.0)
@@ -164,7 +165,13 @@ GEM
     rake (13.0.6)
     regexp_parser (2.8.0)
     rexml (3.2.5)
-    rr (1.2.1)
+    rspec-expectations (3.13.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.2)
     rubocop (1.50.2)
       json (~> 2.3)
       parallel (~> 1.10)
@@ -225,7 +232,8 @@ DEPENDENCIES
   mutex_m (>= 0.3.0)
   mysql2
   pry
-  rr (~> 1.1)
+  rspec-expectations
+  rspec-mocks
   rubocop
   rubocop-minitest
   rubocop-rails
diff --git a/gemfiles/rails_6_0.gemfile b/gemfiles/rails_6_0.gemfile
index 4d30ed5..1b4b9d9 100644
--- a/gemfiles/rails_6_0.gemfile
+++ b/gemfiles/rails_6_0.gemfile
@@ -8,7 +8,8 @@ gem "minitest", "~> 5.1"
 gem "minitest-reporters"
 gem "mysql2"
 gem "pry"
-gem "rr", "~> 1.1"
+gem "rspec-expectations"
+gem "rspec-mocks"
 gem "rubocop", require: false
 gem "rubocop-minitest", require: false
 gem "rubocop-rails", require: false
diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_6_1.gemfile
index 31533d3..9d8e84d 100644
--- a/gemfiles/rails_6_1.gemfile
+++ b/gemfiles/rails_6_1.gemfile
@@ -8,7 +8,8 @@ gem "minitest", "~> 5.1"
 gem "minitest-reporters"
 gem "mysql2"
 gem "pry"
-gem "rr", "~> 1.1"
+gem "rspec-expectations"
+gem "rspec-mocks"
 gem "rubocop", require: false
 gem "rubocop-minitest", require: false
 gem "rubocop-rails", require: false
diff --git a/gemfiles/rails_7_0.gemfile b/gemfiles/rails_7_0.gemfile
index 359de72..56e6ced 100644
--- a/gemfiles/rails_7_0.gemfile
+++ b/gemfiles/rails_7_0.gemfile
@@ -8,7 +8,8 @@ gem "minitest", "~> 5.1"
 gem "minitest-reporters"
 gem "mysql2"
 gem "pry"
-gem "rr", "~> 1.1"
+gem "rspec-expectations"
+gem "rspec-mocks"
 gem "rubocop", require: false
 gem "rubocop-minitest", require: false
 gem "rubocop-rails", require: false
diff --git a/gemfiles/rails_7_1.gemfile b/gemfiles/rails_7_1.gemfile
index e26e232..490812e 100644
--- a/gemfiles/rails_7_1.gemfile
+++ b/gemfiles/rails_7_1.gemfile
@@ -8,7 +8,8 @@ gem "minitest", "~> 5.1"
 gem "minitest-reporters"
 gem "mysql2"
 gem "pry"
-gem "rr", "~> 1.1"
+gem "rspec-expectations"
+gem "rspec-mocks"
 gem "rubocop", require: false
 gem "rubocop-minitest", require: false
 gem "rubocop-rails", require: false
diff --git a/gemfiles/rails_7_2.gemfile b/gemfiles/rails_7_2.gemfile
index 18775e4..6b6ac38 100644
--- a/gemfiles/rails_7_2.gemfile
+++ b/gemfiles/rails_7_2.gemfile
@@ -8,7 +8,8 @@ gem "minitest", "~> 5.1"
 gem "minitest-reporters"
 gem "mysql2"
 gem "pry"
-gem "rr", "~> 1.1"
+gem "rspec-expectations"
+gem "rspec-mocks"
 gem "rubocop", require: false
 gem "rubocop-minitest", require: false
 gem "rubocop-rails", require: false
diff --git a/gemfiles/rails_8_0.gemfile b/gemfiles/rails_8_0.gemfile
index 10685e1..1723e09 100644
--- a/gemfiles/rails_8_0.gemfile
+++ b/gemfiles/rails_8_0.gemfile
@@ -8,7 +8,8 @@ gem "minitest", "~> 5.1"
 gem "minitest-reporters"
 gem "mysql2"
 gem "pry"
-gem "rr", "~> 1.1"
+gem "rspec-expectations"
+gem "rspec-mocks"
 gem "rubocop", require: false
 gem "rubocop-minitest", require: false
 gem "rubocop-rails", require: false
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 653401b..d8758c8 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -15,7 +15,8 @@
 require "minitest/unit"
 require "pry"
 require "rails/test_help"
-require "rr"
+require 'rspec/mocks/minitest_integration'
+require 'rspec/expectations/minitest_integration'
 require "shoulda"
 require 'minitest/reporters'