Merge pull request #571 from SFDigitalServices/release-04-25-2023

April 2023 Release
SFDigitalServices · Apr 26, 2023 · 9d55c14 · 9d55c14
2 parents 46389a6 + 4d0bdb7
commit 9d55c14
Show file tree

Hide file tree

Showing 67 changed files with 10,884 additions and 10,588 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,11 +3,12 @@ version: 2.1
 executors:
   ruby_node:
     docker:
-      - image: 'circleci/ruby:2.7.0-node-browsers'
+      - image: 'cimg/ruby:3.1.3-browsers'
         environment:
           - RAILS_ENV: development
           - PGHOST: 127.0.0.1
           - PGUSER: root
+          - NODE_OPTIONS: --openssl-legacy-provider
     working_directory: ~/tmp
 non_production_jobs: &non_production_jobs
   filters:
@@ -27,27 +28,27 @@ aliases:
       at: ~/tmp
   - &restore_yarn_cache
     restore_cache:
-        name: Restore Yarn Cache
-        keys:
-          - partners-{{ .Environment.CACHE_VERSION }}-yarn-packages-{{ .Branch }}-{{ checksum "yarn.lock" }}
-          - partners-{{ .Environment.CACHE_VERSION }}-yarn-packages-{{ .Branch }}
-          - partners-{{ .Environment.CACHE_VERSION }}-yarn-packages-main
-          - partners-{{ .Environment.CACHE_VERSION }}-yarn-packages-
+      name: Restore Yarn Cache
+      keys:
+        - partners-{{ .Environment.CACHE_VERSION }}-yarn-packages-{{ .Branch }}-{{ checksum "yarn.lock" }}
+        - partners-{{ .Environment.CACHE_VERSION }}-yarn-packages-{{ .Branch }}
+        - partners-{{ .Environment.CACHE_VERSION }}-yarn-packages-main
+        - partners-{{ .Environment.CACHE_VERSION }}-yarn-packages-
   - &restore_bundler_cache
     restore_cache:
-        name: Restore Bundler Cache
-        keys:
-          - partners-{{ .Environment.CACHE_VERSION }}-dependencies-v1-{{ checksum "Gemfile.lock" }}
-          - partners-{{ .Environment.CACHE_VERSION }}-dependencies-v1
+      name: Restore Bundler Cache
+      keys:
+        - partners-{{ .Environment.CACHE_VERSION }}-dependencies-v1-{{ checksum "Gemfile.lock" }}
+        - partners-{{ .Environment.CACHE_VERSION }}-dependencies-v1
 commands:
   prepare_workspace:
-    description: "Attach workspace and restore cache"
+    description: 'Attach workspace and restore cache'
     steps:
       - *attach_workspace
       - *restore_yarn_cache
       - *restore_bundler_cache
   run-e2e:
-    description: "Run e2e tests"
+    description: 'Run e2e tests'
     steps:
       - checkout
       - prepare_workspace
@@ -101,7 +102,7 @@ jobs:
       - run: bundle exec rake db:setup
       - run: bundle exec rake db:test:prepare
       - run:
-          name:  Download cc-test-reporter
+          name: Download cc-test-reporter
           command: |
             mkdir -p tmp/
             curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./tmp/cc-test-reporter

diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,18 +1,18 @@
 AllCops:
   TargetRubyVersion: 2.7
   Include:
-    - "**/Rakefile"
-    - "**/config.ru"
-    - "lib/tasks/**/*"
+    - '**/Rakefile'
+    - '**/config.ru'
+    - 'lib/tasks/**/*'
   Exclude:
     - Gemfile*
-    - "db/migrate/*"
-    - "db/schema.rb"
-    - "bin/**/*"
-    - "vendor/bundle/**/*"
-    - "node_modules/**/*"
-    - "config/environments/production.rb"
-    - "config/initializers/devise.rb"
+    - 'db/migrate/*'
+    - 'db/schema.rb'
+    - 'bin/**/*'
+    - 'vendor/bundle/**/*'
+    - 'node_modules/**/*'
+    - 'config/environments/production.rb'
+    - 'config/initializers/devise.rb'
 
 # We don't care about method length, since we check method cyclomatic
 # complexity.
@@ -44,8 +44,8 @@ Style/PercentLiteralDelimiters:
   PreferredDelimiters:
     # Using `[]` for string arrays instead of `()`, since normal arrays are
     # indicated with `[]` not `()`.
-    "%w": "[]"
-    "%W": "[]"
+    '%w': '[]'
+    '%W': '[]'
 
 Style/AndOr:
   # Whether `and` and `or` are banned only in conditionals (conditionals)
@@ -55,19 +55,22 @@ Style/AndOr:
 
 Style/ClassAndModuleChildren:
   Exclude:
-    - "app/controllers/**/*"
+    - 'app/controllers/**/*'
 
 Style/ConditionalAssignment:
   Enabled: false
 
 Metrics/LineLength:
   Max: 140
   Exclude:
-    - "config/routes.rb"
+    - 'config/routes.rb'
 
 Metrics/BlockLength:
   Max: 25
   Exclude:
-    - "config/routes.rb"
-    - "spec/**/*_spec.rb"
-    - "spec/support/**/*"
+    - 'config/routes.rb'
+    - 'spec/**/*_spec.rb'
+    - 'spec/support/**/*'
+
+Lint/EmptyFile:
+  Enabled: false
diff --git a/Gemfile b/Gemfile
@@ -1,17 +1,17 @@
 source 'https://rubygems.org'
-ruby '2.7.0'
+ruby '3.1.3'
 
 git_source(:github) do |repo_name|
   repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
   "https://github.com/#{repo_name}.git"
 end
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 5.2.5'
+gem 'rails', '~> 6.1.7.3'
 # Set a minimum version for Rack to avoid security vulnerability in Rack <2.2.3
 gem 'rack', '>= 2.2.3'
 # Use Puma as the app server
-gem 'puma', '~> 4.3.12'
+gem 'puma', '~> 6.2.1'
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 5.0'
 # Use Uglifier as compressor for JavaScript assets
@@ -35,16 +35,18 @@ gem 'jbuilder', '~> 2.5'
 gem 'newrelic_rpm'
 gem 'mini_portile2', '~> 2.5', '>= 2.5.1'
 
+gem 'psych', '< 4'
+
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
   # Adds support for Capybara system testing and selenium driver
-  gem 'capybara', '~> 2.13'
+  gem 'capybara', '~> 3.39'
   gem 'selenium-webdriver', '~> 3.142.7'
   gem 'dotenv-rails', '~> 2.2'
   gem 'pry-rails'
   gem 'binding_of_caller'
-  gem 'rspec-rails', '~> 3.7'
+  gem 'rspec-rails', '~> 4.0.2'
   gem 'webmock'
   gem "pry-byebug", '~> 3.9.0'
   gem 'awesome_print'
@@ -55,7 +57,8 @@ group :development, :test do
   # https://github.com/codeclimate/test-reporter/issues/418
   gem 'simplecov', '~> 0.10', '< 0.18', require: false
   gem 'ruby-debug-ide'
-  gem 'debase'
+  gem "debase", "0.2.5.beta2"
+  # gem "debug", ">= 1.0.0"
 end
 
 group :development do
@@ -71,40 +74,40 @@ group :development do
   gem 'better_errors'
   gem 'rubocop', require: false
   # Use sqlite3 as the database for Active Record
-  gem 'sqlite3', '= 1.3.13'
+  gem 'sqlite3', '~> 1.6.2'
 end
 
 gem 'rails_12factor', group: :production
-gem "sentry-raven", "~> 2.9.0"
+gem "sentry-raven"
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 # gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
 # Added at 2017-10-22 23:46:25 -0700 by dkaplan:
-gem "devise", "~> 4.7"
+gem "devise", "~> 4.9.0"
 
 # Added at 2017-10-22 23:48:56 -0700 by dkaplan:
-gem "omniauth-salesforce", "~> 1.0"
+gem "omniauth-salesforce", "~> 1.0.5"
 gem "omniauth-rails_csrf_protection"
 
 # Added at 2017-10-24 00:03:53 -0700 by dkaplan:
-gem "restforce", "~> 4.2"
+gem "restforce", "~> 6.2.2"
 # handy ruby extensions
 gem 'facets', require: false
 
 # Added at 2017-10-24 08:23:22 -0700 by dkaplan:
 gem "slim-rails", "~> 3.1"
 
 # Added at 2017-10-25 00:30:33 -0700 by dkaplan:
-gem "hashie", "~> 3.5"
+gem "hashie"
 
 # Added at 2017-10-29 23:29:10 -0700 by dkaplan:
-gem "webpacker", "~> 4.0"
+gem "webpacker", "~> 5.4.4"
 
 # Added at 2017-10-29 23:57:32 -0700 by dkaplan:
 gem "webpacker-react", "~> 0.3.2"
 
 # Added at 2017-11-10 09:14:41 -0800 by dkaplan:
-gem "pg", "~> 0.21.0"
+gem "pg", "~> 1.4.6"
 
 gem 'scout_apm'