From e9fb386d6895f67ee1172144af5369156ad1db77 Mon Sep 17 00:00:00 2001
From: baarkerlounger <db@slothlife.xyz>
Date: Tue, 28 Dec 2021 10:10:27 +0000
Subject: [PATCH] Use Rspec from rubygems

---
 Gemfile      | 10 +++-----
 Gemfile.lock | 70 ++++++++++++++--------------------------------------
 2 files changed, 22 insertions(+), 58 deletions(-)

diff --git a/Gemfile b/Gemfile
index e37407b82..50a427e8e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -53,10 +53,10 @@ end
 group :development do
   # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
   gem "web-console", ">= 4.1.0"
-  # Display performance information such as SQL time and flame graphs for each request in your browser.
-  # Can be configured to work on production as well see: https://github.com/MiniProfiler/rack-mini-profiler/blob/master/README.md
   gem "listen", "~> 3.3"
   gem "overcommit", ">= 0.37.0"
+  # Display performance information such as SQL time and flame graphs for each request in your browser.
+  # Can be configured to work on production as well see: https://github.com/MiniProfiler/rack-mini-profiler/blob/master/README.md
   gem "rack-mini-profiler", "~> 2.0"
   gem "rubocop-govuk", require: false
   gem "rubocop-performance", require: false
@@ -70,10 +70,8 @@ group :test do
   gem "factory_bot_rails"
   gem "selenium-webdriver", require: false
   gem "simplecov", require: false
-  gem "webmock"
-  %w[rspec-core rspec-expectations rspec-mocks rspec-rails rspec-support].each do |lib|
-    gem lib, git: "https://github.com/rspec/#{lib}.git", branch: "main", require: false
-  end
+  gem "webmock", require: false
+  gem "rspec-rails", require: false
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
diff --git a/Gemfile.lock b/Gemfile.lock
index 1d9e7c172..e2bf7f98f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -28,53 +28,6 @@ GIT
       responders
       warden (~> 1.2.3)
 
-GIT
-  remote: https://github.com/rspec/rspec-core.git
-  revision: e3bda9da1e625a428fd005f0d1a633531f5da749
-  branch: main
-  specs:
-    rspec-core (3.11.0.pre)
-      rspec-support (= 3.11.0.pre)
-
-GIT
-  remote: https://github.com/rspec/rspec-expectations.git
-  revision: d9fd9a5589e3914bcd25d66560eccadd75493727
-  branch: main
-  specs:
-    rspec-expectations (3.11.0.pre)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (= 3.11.0.pre)
-
-GIT
-  remote: https://github.com/rspec/rspec-mocks.git
-  revision: 17cf86ab61544b93232c4e9ca9784ab212dccbf6
-  branch: main
-  specs:
-    rspec-mocks (3.11.0.pre)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (= 3.11.0.pre)
-
-GIT
-  remote: https://github.com/rspec/rspec-rails.git
-  revision: 84d3ba39770e341f6e19d65f5ecce83a8842bff9
-  branch: main
-  specs:
-    rspec-rails (5.1.0.pre)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
-      railties (>= 5.2)
-      rspec-core (= 3.11.0.pre)
-      rspec-expectations (= 3.11.0.pre)
-      rspec-mocks (= 3.11.0.pre)
-      rspec-support (= 3.11.0.pre)
-
-GIT
-  remote: https://github.com/rspec/rspec-support.git
-  revision: 321dc7227df43cd682c293fa31fa427b94b2ea74
-  branch: main
-  specs:
-    rspec-support (3.11.0.pre)
-
 GIT
   remote: https://github.com/tagliala/activeadmin.git
   revision: 12ef798e1a02084565fa2ea698e26334dbc56e42
@@ -334,6 +287,23 @@ GEM
     roo (2.8.3)
       nokogiri (~> 1)
       rubyzip (>= 1.3.0, < 3.0.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-rails (5.0.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      railties (>= 5.2)
+      rspec-core (~> 3.10)
+      rspec-expectations (~> 3.10)
+      rspec-mocks (~> 3.10)
+      rspec-support (~> 3.10)
+    rspec-support (3.10.3)
     rubocop (1.23.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
@@ -453,11 +423,7 @@ DEPENDENCIES
   rack-mini-profiler (~> 2.0)
   rails (~> 7.0.0)
   roo
-  rspec-core!
-  rspec-expectations!
-  rspec-mocks!
-  rspec-rails!
-  rspec-support!
+  rspec-rails
   rubocop-govuk
   rubocop-performance
   rubocop-rails