Upgrade Rails to 8.1 and Ruby to 3.4.9

.circleci/config.yml

@@ -23,7 +23,7 @@ orbs:
 
 defaults: &defaults
   docker:
-    - image: cimg/ruby:2.7.3
+    - image: cimg/ruby:3.4.9
   working_directory: ~/api.goodcity
 
 jobs:
@@ -40,7 +40,7 @@ jobs:
     <<: *defaults
     steps:
       - run: mkdir -p ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
-      - run: gem install bundler:2.2.27
+      - run: gem install bundler:2.6.9
       - restore_cache:
           key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
       - restore_cache: *restore-bundler-cache
@@ -50,43 +50,55 @@ jobs:
   test:
     <<: *defaults
     docker:
-      - image: cimg/ruby:2.7.3-browsers
+      - image: cimg/ruby:3.4.9-browsers
       - image: cimg/redis:6.0
-      - image: cimg/postgres:9.6
+      - image: cimg/postgres:14.20
         environment:
           POSTGRES_USER: postgres
           POSTGRES_DB: goodcity_server_test
     parallelism: 3
     environment:
       RAILS_ENV: test
-      DATABASE_URL: "postgres://postgres@localhost:5432/goodcity_server_test"
+      # Parallel containers share one Postgres service — each node MUST use its own database or
+      # transactional specs race on delete_all / factories (flaky appointment_slots, orders, etc.).
+      # DATABASE_URL is set in each DB-using step via CIRCLE_NODE_INDEX.
     steps:
       - run: sudo apt update && sudo apt -y upgrade libu2f-udev
       - browser-tools/install-browser-tools
       - run:
           name: Install PostgreSQL Client (required to run migrations)
           command: |
-            sudo sh -c 'echo "deb https://apt-archive.postgresql.org/pub/repos/apt `lsb_release -cs`-pgdg main" >> /etc/apt/sources.list.d/pgdg.list'
-            wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
             sudo apt update
-            sudo apt-get install postgresql-client-9.6
+            sudo apt-get install -y postgresql-client
       - attach_workspace:
           at: ~/api.goodcity/tmp
       - restore_cache:
           key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
       - restore_cache: *restore-bundler-cache
-      - run: gem install bundler:2.2.27 && bundle config set --local deployment 'true' && (bundle check || bundle install --jobs=2 --retry=3)
+      - run: gem install bundler:2.6.9 && bundle config set --local deployment 'true' && (bundle check || bundle install --jobs=2 --retry=3)
       - run:
           name: Wait for DB and Redis containers to start
           command: dockerize -wait tcp://localhost:5432 -wait tcp://localhost:6379 -timeout 1m
-      - run: bundle exec rails db:create:all db:migrate
+      - run:
+          name: Setup test database (per parallel container)
+          command: |
+            export DATABASE_URL="postgres://postgres@localhost:5432/goodcity_server_test_${CIRCLE_NODE_INDEX:-0}"
+            bundle exec rails db:create db:migrate
       - run:
           name: Cucumber tests
           command: |
+            export DATABASE_URL="postgres://postgres@localhost:5432/goodcity_server_test_${CIRCLE_NODE_INDEX:-0}"
             bundle exec cucumber
+      - run:
+          name: Recreate test database after Cucumber
+          command: |
+            export DATABASE_URL="postgres://postgres@localhost:5432/goodcity_server_test_${CIRCLE_NODE_INDEX:-0}"
+            bundle exec rails db:drop db:create db:schema:load
       - run:
           name: Rspec tests
           command: |
+            export DATABASE_URL="postgres://postgres@localhost:5432/goodcity_server_test_${CIRCLE_NODE_INDEX:-0}"
+            mkdir -p ~/rspec
             bundle exec rspec --format progress \
                               --format RspecJunitFormatter \
                               --out ~/rspec/rspec.xml \
@@ -108,7 +120,7 @@ jobs:
       - restore_cache:
           key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
       - restore_cache: *restore-bundler-cache
-      - run: gem install bundler:2.2.27 && bundle config set --local deployment 'true' && (bundle check || bundle install --jobs=2 --retry=3)
+      - run: gem install bundler:2.6.9 && bundle config set --local deployment 'true' && (bundle check || bundle install --jobs=2 --retry=3)
       - run: |
           STAGE=$(if [ "$CIRCLE_BRANCH" == "live" ]; then echo production; else echo staging; fi)
           bundle exec cap ${STAGE} deploy

.ruby-version

@@ -1 +1 @@
-ruby-2.7.3
+ruby-3.4.9

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.7.3-alpine
+FROM ruby:3.4.9-alpine
 
 ARG GITHUB_TOKEN
 

Gemfile

@@ -1,20 +1,29 @@
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
-ruby '2.7.3'
+ruby '3.4.9'
 
 gem 'pg'
-gem 'rails', '~> 6.1.4'
+gem 'rails', '~> 8.1', '>= 8.1.3'
 gem 'rake'
 
+# Required because `config/application.rb` loads `sprockets/railtie`
+gem 'sprockets-rails'
+
+# Ruby 3.4: stdlib gem needed by ActiveSupport 6.1
+gem 'mutex_m', require: false
+# Ruby 3.4: stdlib gem needed by ActiveSupport 6.1
+gem 'drb', require: false
+
 gem 'active_model_otp'
 gem 'active_model_serializers', '~> 0.8.0'
-gem 'active_record_union'
+gem 'active_record_union', '~> 1.4'
 gem 'apipie-rails', git: "https://github.com/Apipie/apipie-rails.git", ref: "a55d836"
 gem 'bootsnap', require: false
 gem 'by_star'
 gem 'cancancan'
 gem 'cloudinary'
+gem 'csv'
 gem 'dotenv-rails'
 gem 'easyzpl', git: 'https://github.com/crossroads/easyzpl.git'
 gem 'factory_bot_rails' # used in rake db:seed in production
@@ -31,13 +40,13 @@ gem 'nestful'
 gem 'newrelic_rpm'
 gem 'nokogiri'
 gem 'oj'
-gem 'paper_trail'
+gem 'paper_trail', '>= 17.0.0'
 gem 'paranoia'
 gem 'puma'
 gem 'rack-cors', require: 'rack/cors'
 gem 'rack-protection'
 gem 'rack-timeout', require: 'rack/timeout/base'
-gem 'rails-i18n'
+gem 'rails-i18n', '~> 8.1', '>= 8.1.0'
 gem 'rake-progressbar'
 gem 'redis' # Used for Rails cache_store
 gem 'request_store'
@@ -47,7 +56,7 @@ gem 'rotp'
 gem 'rubyXL'
 gem 'sidekiq', '<8'
 gem 'sidekiq-scheduler'
-gem 'state_machine'
+gem 'state_machines-activerecord', '~> 0.9.0'
 gem 'traco'
 gem 'twilio-ruby'
 gem 'whenever', require: false
@@ -84,7 +93,9 @@ group :development, :test do
 end
 
 group :test do
-  gem 'cucumber-rails', require: false
+  # Cucumber < 9 raises ArgumentError on Ruby 3.4 (DataTable / Struct keywords).
+  gem 'cucumber', '~> 10.2'
+  gem 'cucumber-rails', '>= 4.0.1', require: false
   gem 'database_cleaner'
   gem 'email_spec'
   gem 'rails-controller-testing'