Upgrade from Rails 6.1 to 7.0

.github/workflows/run-tests.yml

@@ -41,7 +41,7 @@ jobs:
         uses: ruby/setup-ruby@v1
       - uses: actions/setup-node@v4
         with:
-          node-version: '14'
+          node-version: '16'
       - name: Cache ruby gems
         uses: actions/cache@v4
         with:

.overcommit.yml

@@ -0,0 +1,159 @@
+# Overcommit configuration for Rails projects
+# https://github.com/sds/overcommit
+
+# Don't use Bundler context since overcommit is installed globally
+gemfile: false
+
+# Hooks that run during `git commit`
+CommitMsg:
+  # Enforce proper commit message format
+  CapitalizedSubject:
+    enabled: true
+    description: 'Check subject capitalization'
+  EmptyMessage:
+    enabled: true
+    description: 'Check for empty commit message'
+  TextWidth:
+    enabled: true
+    description: 'Check text width'
+    max_subject_width: 72
+    max_body_width: 80
+  TrailingPeriod:
+    enabled: true
+    description: 'Check for trailing periods in subject'
+  SingleLineSubject:
+    enabled: true
+    description: 'Check subject is single line'
+
+# Hooks that run before `git commit`
+PreCommit:
+  # Ruby/Rails specific hooks
+  RuboCop:
+    enabled: true
+    description: 'Analyze Ruby code with RuboCop'
+    required_executable: 'bundle'
+    command: ['bundle', 'exec', 'rubocop']
+    flags: ['--autocorrect-all', '--display-cop-names']
+    on_warn: fail # Treat warnings as failures
+    problem_on_unmodified_line: report
+    include:
+      - '**/*.rb'
+      - '**/*.rake'
+      - '**/Gemfile'
+      - '**/Rakefile'
+
+  RailsBestPractices:
+    enabled: false # Enable when ready
+    description: 'Analyze with rails_best_practices'
+    required_executable: 'bundle'
+    command: ['bundle', 'exec', 'rails_best_practices']
+
+  RailsSchemaUpToDate:
+    enabled: true
+    description: 'Check if db/schema.rb matches migrations'
+
+  BundleCheck:
+    enabled: true
+    description: 'Check Gemfile dependencies'
+
+  # JavaScript/Vue specific hooks
+  EsLint:
+    enabled: true
+    description: 'Analyze JavaScript/Vue with ESLint'
+    required_executable: 'yarn'
+    command: ['yarn', 'lint']
+    include:
+      - '**/*.js'
+      - '**/*.vue'
+
+  # Shell script hooks
+  ShellCheck:
+    enabled: false
+    description: 'Analyze shell scripts with ShellCheck'
+    include:
+      - '**/*.sh'
+      - '**/bin/*'
+    exclude:
+      - '**/bin/*.rb'
+      - '**/bin/bundle'
+      - '**/bin/rails'
+      - '**/bin/rake'
+      - '**/bin/spring'
+      - '**/bin/webpack'
+      - '**/bin/webpack-dev-server'
+      - '**/bin/yarn'
+
+  # General hooks
+  TrailingWhitespace:
+    enabled: true
+    exclude:
+      - '**/db/schema.rb'
+      - '**/db/structure.sql'
+      - '**/*.md'
+
+  MergeConflicts:
+    enabled: true
+
+  YamlSyntax:
+    enabled: true
+    include:
+      - '**/*.yml'
+      - '**/*.yaml'
+
+  JsonSyntax:
+    enabled: true
+    include:
+      - '**/*.json'
+
+  HardTabs:
+    enabled: true
+    exclude:
+      - '**/Makefile'
+      - '**/*.mk'
+
+  # Security scanning (disabled by default for speed)
+  Brakeman:
+    enabled: false
+    description: 'Security scan with Brakeman'
+    command: ['bundle', 'exec', 'brakeman', '--quiet', '--summary']
+
+  BundleAudit:
+    enabled: false
+    description: 'Check for vulnerable gem versions'
+
+# Hooks that run after `git checkout`
+PostCheckout:
+  BundleInstall:
+    enabled: true
+    description: 'Install bundle dependencies'
+
+  YarnInstall:
+    enabled: true
+    description: 'Install yarn dependencies'
+    required_executable: 'yarn'
+    command: ['yarn', 'install']
+
+  ActiveRecordMigrations:
+    enabled: true
+    description: 'Run pending migrations'
+
+# Hooks that run after `git merge`
+PostMerge:
+  BundleInstall:
+    enabled: true
+
+  YarnInstall:
+    enabled: true
+    required_executable: 'yarn'
+    command: ['yarn', 'install']
+
+  ActiveRecordMigrations:
+    enabled: true
+
+# Hooks that run after `git rewrite`
+PostRewrite:
+  BundleInstall:
+    enabled: true
+
+  YarnInstall:
+    enabled: true

.rubocop.yml

@@ -1,4 +1,4 @@
-require:
+plugins:
   - rubocop-rails
   - rubocop-performance
 

.ruby-version

@@ -1 +1 @@
-2.7.5
+3.0.6

.tool-versions

@@ -1 +1,2 @@
-ruby 2.7.5
+ruby 3.0.6
+nodejs 16.20.2

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.7
+FROM ruby:3.0.7
 
 RUN curl -sS https://deb.nodesource.com/setup_16.x | bash -
 RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
@@ -10,7 +10,7 @@ ENV RAILS_ENV=production
 RUN mkdir $APP_HOME
 WORKDIR $APP_HOME
 
-RUN gem install bundler:2.2.32
+RUN gem install bundler:2.3.10
 ADD Gemfile* $APP_HOME/
 RUN bundle install --without development test
 

Gemfile

@@ -2,10 +2,12 @@
 
 source 'https://rubygems.org'
 
-ruby '~> 2.7'
+ruby File.read('.ruby-version').strip
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 6.1.4'
+gem 'rails', '~> 7.0.0'
+# TODO: Remove this once upgrading to Rails 7.1, this is required for a bug specific to Rails 7.0
+gem 'concurrent-ruby', '1.3.4'
 # Use postgresql as the database for Active Record
 gem 'pg', '>= 0.18', '< 2.0'
 # Use Puma as the app server
@@ -45,7 +47,7 @@ gem 'settingslogic', '~> 2.0.9'
 # Reduces boot times through caching; required in config/boot.rb
 gem 'bootsnap', '>= 1.4.2', require: false
 
-gem 'audited', '~> 5.3.3'
+gem 'audited', '~> 5.8.0'
 
 gem 'activerecord-import'
 
@@ -61,6 +63,8 @@ gem 'fast_excel'
 # For writing excel files
 gem 'ruh-roo', '~> 3.0.0', require: 'roo'
 
+gem 'rexml'
+
 gem 'ox'
 
 gem 'rubyzip'
@@ -69,37 +73,37 @@ gem 'mitre-inspec-objects'
 gem 'rest-client'
 
 group :development do
-  gem 'listen', '~> 3.1.5'
+  gem 'listen'
   # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
   gem 'web-console', '>= 3.3.0'
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'letter_opener'
   gem 'spring'
-  gem 'spring-watcher-listen', '~> 2.0.0'
+  gem 'spring-watcher-listen'
   # Process manager for Procfile-based applications (development only)
   gem 'foreman'
+  # Git hook manager for automated linting and formatting
+  gem 'overcommit', '~> 0.60', require: false
 end
 
 group :test do
   # Adds support for Capybara system testing and selenium driver
-  gem 'capybara', '>= 2.15'
-  gem 'selenium-webdriver'
-  # Easy installation and use of web drivers to run system tests with browsers
-  # gem 'webdrivers'
-
+  gem 'capybara'
   gem 'database_cleaner-active_record'
   gem 'rubocop', require: false
   gem 'rubocop-performance'
   gem 'rubocop-rails'
+  gem 'selenium-webdriver'
   gem 'simplecov', require: false
 end
 
 group :development, :test do
   gem 'brakeman'
   gem 'byebug'
-  gem 'factory_bot_rails', '~> 5.2.0'
+  gem 'factory_bot_rails', '~> 6.4.0'
+  gem 'pry'
   gem 'rspec-mocks'
-  gem 'rspec-rails', '~> 4.0.0'
+  gem 'rspec-rails', '~> 6.0.0'
   # Load environment variables from .env files in development and test
   gem 'dotenv-rails'
 end