Revert "Upgrade ruby v3 3 (#4357)" (#4367)

This reverts commit 6c7ce27.

.devcontainer/devcontainer.json

@@ -12,7 +12,7 @@
       "version": "latest"
     },
     "ghcr.io/devcontainers/features/ruby:1": {
-      "version": "3.3.6"
+      "version": "3.1.4"
     },
     "ghcr.io/devcontainers/features/node:1": {
       "version": "18.16"

.ruby-version

@@ -1 +1 @@
-3.3.6
+3.1.4

.tool-versions

@@ -1,2 +1,2 @@
 terraform 1.5.4
-ruby      3.3.6
+ruby      3.1.4

Dockerfile

@@ -1,5 +1,5 @@
 # To use or update to a ruby version, change BASE_RUBY_IMAGE
-ARG BASE_RUBY_IMAGE=ruby:3.3.6-alpine3.20
+ARG BASE_RUBY_IMAGE=ruby:3.1.4-alpine3.18
 
 FROM ${BASE_RUBY_IMAGE} AS base
 

Gemfile

@@ -134,12 +134,13 @@ group :development, :test do
 
   # Testing framework
   gem "knapsack"
-  gem "rspec-rails", "~> 7.1.0"
+  gem "rspec-rails", "~> 6.0.3"
 
   # Adds support for Capybara system testing and selenium driver
   gem "capybara", "~> 3.40.0"
   gem "factory_bot_rails", ">= 6.2.0"
-  gem "rspec-sonarqube-formatter", "~> 1.6.1", require: false
+  # See: https://github.com/otherguy/rspec-sonarqube-formatter/pull/63
+  gem "rspec-sonarqube-formatter", github: "otherguy/rspec-sonarqube-formatter", ref: "13fe436", require: false
   gem "simplecov"
 
   # Linting

Gemfile.lock

@@ -68,6 +68,15 @@ GIT
       activemodel (>= 6.0.0, < 7.1)
       timeliness (>= 0.3.10, < 1)
 
+GIT
+  remote: https://github.com/otherguy/rspec-sonarqube-formatter.git
+  revision: 13fe436921e1442a09c23d9e46055773d1511638
+  ref: 13fe436
+  specs:
+    rspec-sonarqube-formatter (1.0.0.pre.local)
+      htmlentities (~> 4.3.3)
+      rspec (~> 3.0)
+
 GIT
   remote: https://github.com/pkorenev/rack-page_caching.git
   revision: 9ca404f7f7e4773030e75799da7ab02e27cbe9a3
@@ -196,7 +205,7 @@ GEM
     csv (3.3.0)
     declarative (0.0.20)
     delegate (0.3.1)
-    diff-lcs (1.5.1)
+    diff-lcs (1.5.0)
     docile (1.4.0)
     dotenv (3.1.2)
     dotenv-rails (3.1.2)
@@ -371,7 +380,7 @@ GEM
       mixlib-shellout
     method_source (1.1.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.8)
+    mini_portile2 (2.8.7)
     minitest (5.25.1)
     mixlib-cli (2.1.8)
     mixlib-config (3.0.27)
@@ -391,10 +400,10 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.3)
-    nokogiri (1.16.7)
+    nokogiri (1.16.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.16.7-x86_64-linux)
+    nokogiri (1.16.5-x86_64-linux)
       racc (~> 1.4)
     observer (0.1.1)
     os (1.1.4)
@@ -488,32 +497,29 @@ GEM
     rexml (3.3.3)
       strscan
     rinku (2.0.6)
-    rspec (3.13.0)
-      rspec-core (~> 3.13.0)
-      rspec-expectations (~> 3.13.0)
-      rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.2)
-      rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.3)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.2)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-rails (7.1.0)
-      actionpack (>= 7.0)
-      activesupport (>= 7.0)
-      railties (>= 7.0)
-      rspec-core (~> 3.13)
-      rspec-expectations (~> 3.13)
-      rspec-mocks (~> 3.13)
-      rspec-support (~> 3.13)
+      rspec-support (~> 3.12.0)
+    rspec-rails (6.0.3)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
+      railties (>= 6.1)
+      rspec-core (~> 3.12)
+      rspec-expectations (~> 3.12)
+      rspec-mocks (~> 3.12)
+      rspec-support (~> 3.12)
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
-    rspec-sonarqube-formatter (1.6.1)
-      htmlentities (~> 4.3)
-      rspec (~> 3.0)
-    rspec-support (3.13.1)
+    rspec-support (3.12.0)
     rubocop (1.64.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
@@ -632,7 +638,7 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.7.1)
+    zeitwerk (2.6.18)
 
 PLATFORMS
   ruby
@@ -700,9 +706,9 @@ DEPENDENCIES
   redis-session-store (>= 0.11.4)
   rexml (>= 3.2.5)
   rinku
-  rspec-rails (~> 7.1.0)
+  rspec-rails (~> 6.0.3)
   rspec-retry
-  rspec-sonarqube-formatter (~> 1.6.1)
+  rspec-sonarqube-formatter!
   rubocop-govuk (~> 5.0.2)
   secure_headers
   selenium-webdriver (~> 4.21.1)
@@ -726,7 +732,7 @@ DEPENDENCIES
   webmock (>= 3.14.0)
 
 RUBY VERSION
-   ruby 3.3.6
+   ruby 3.1.4p223
 
 BUNDLED WITH
    2.3.4

config/application.rb

@@ -19,9 +19,6 @@
 # you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)
 
-# Patch to Rack::PageCaching::Utils to substitute Fixnum --> Integer
-require_relative "../lib/patch_rack_page_caching"
-
 module GetIntoTeachingWebsite
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.

config/environments/development.rb

@@ -72,5 +72,5 @@
   config.x.dfe_analytics = true
 
   # Allow access from Codespaces
-  config.hosts << /[a-z0-9-]+\.((preview\.)?app\.github|githubpreview)\.dev/
+  config.hosts << /[a-z0-9-]+\.(preview\.app\.github|githubpreview)\.dev/
 end