Merge pull request #615 from SFDigitalServices/release-03-04-2024

March 2024 Release

.circleci/config.yml

@@ -1,15 +1,18 @@
 # Use the latest 2.1 version of CircleCI pipeline process engine. See: https://circleci.com/docs/2.0/configuration-reference
 version: 2.1
-executors:
-  ruby_node:
-    docker:
-      - 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
+orbs:
+  ruby: circleci/[email protected]
+defaults: &defaults
+  working_directory: ~/tmp
+  docker:
+    - image: cimg/ruby:3.1.3-browsers
+      environment:
+        RAILS_ENV: development
+        PGHOST: 127.0.0.1
+        PGUSER: root
+        NODE_OPTIONS: --openssl-legacy-provider --max_old_space_size=4096
+    - image: 'cypress/base:14.15.0'
+  executor: ruby/default
 non_production_jobs: &non_production_jobs
   filters:
     branches:
@@ -52,6 +55,7 @@ commands:
     steps:
       - checkout
       - prepare_workspace
+      - run: yarn cypress install
       - run: bundle --path vendor/bundle
       - run:
           name: Run rails server in background
@@ -65,21 +69,14 @@ commands:
                 sleep 5
             done
       - run:
-          name: Run Jest tests using test splitting
+          name: Run Cypress tests
           command: |
-            TESTFILES=$(circleci tests glob "spec/javascript/e2e/**/*.e2e.js" | circleci tests split --split-by=timings)
-            echo "$TESTFILES"
-            yarn test:all --testPathPattern=$TESTFILES --runInBand --reporters=default --reporters=jest-junit --forceExit
-          environment:
-            JEST_JUNIT_OUTPUT_DIR: ./reports/junit/
-      - store_test_results:
-          path: ./reports/junit/
-      - store_artifacts:
-          path: ./reports/junit
+            TESTFILES=$(circleci tests glob "cypress/e2e/**/*.e2e.js" | circleci tests split)
+            yarn cypress run --spec $TESTFILES
 
 jobs:
   build:
-    executor: ruby_node
+    <<: *defaults
     steps:
       - checkout
       - prepare_workspace
@@ -113,7 +110,7 @@ jobs:
           paths:
             - .
   backend:
-    executor: ruby_node
+    <<: *defaults
     steps:
       - checkout
       - prepare_workspace
@@ -128,7 +125,7 @@ jobs:
           paths:
             - coverage
   frontend:
-    executor: ruby_node
+    <<: *defaults
     steps:
       - checkout
       - prepare_workspace
@@ -142,12 +139,12 @@ jobs:
           paths:
             - coverage
   e2e:
-    executor: ruby_node
-    parallelism: 4
+    <<: *defaults
+    parallelism: 3
     steps:
       - run-e2e
   coverage:
-    executor: ruby_node
+    <<: *defaults
     steps:
       - checkout
       - *attach_workspace

.eslintrc.js

@@ -20,14 +20,13 @@ module.exports = {
      * Note: All prettier extends configs need to come at the end of the
      * list, so they can override previous rules.
      */
-    'prettier',
-    'prettier/babel',
-    'prettier/react',
-    'prettier/standard'
+    'prettier'
   ],
   globals: {
     Atomics: 'readonly',
-    SharedArrayBuffer: 'readonly'
+    SharedArrayBuffer: 'readonly',
+    cy: 'readonly',
+    Cypress: 'readonly'
   },
   parser: '@babel/eslint-parser',
   parserOptions: {
@@ -57,7 +56,7 @@ module.exports = {
 
     // only allow the first letter to be uppercase in 'describe' block descriptions,
     // 'test' and 'it' block descriptions must start with lowercase
-    'jest/lowercase-name': [
+    'jest/prefer-lowercase-title': [
       'error',
       {
         ignore: ['describe']
@@ -106,7 +105,7 @@ module.exports = {
   settings: {
     react: {
       // Must be updated when package.json react version is bumped
-      version: '16.9.0'
+      version: '18.2.0'
     },
     'import/resolver': {
       node: {

.gitignore

@@ -35,6 +35,10 @@ yarn-debug.log*
 /public/packs-test
 npm-debug.log
 
+# Ignore cypress error screenshots
+/cypress/screenshots/*
+/cypress/downloads/*
+
 # Using yarn rather than npm
 package-lock.json
 coverage
@@ -44,4 +48,7 @@ TAGS
 .vscode/*
 !.vscode-default/*
 .idea/*
-*.iml
+*.iml
+
+# asdf
+.tool-versions

.vscode/settings.json

@@ -1,18 +1,15 @@
 {
-    "javascript.validate.enable": true,
-    "jest.disabledWorkspaceFolders": [
-        "spec/javascript/e2e"
-    ],
-    "editor.codeActionsOnSave": {
-        // For ESLint
-        "source.fixAll.eslint": true,
-    },
-    "eslint.format.enable": true,
-    "eslint.lintTask.enable": true,
-    "eslint.packageManager": "yarn",
-    "jest.runAllTestsFirst": false,
-    "jest.rootPath": "./",
-    "autoimport.sourceRoot": "./app/javascript",
-    "autoimport.semicolon": false,
-    "autoimport.absolute": true,
-}
+  "javascript.validate.enable": true,
+  "jest.disabledWorkspaceFolders": ["spec/javascript/e2e"],
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": "explicit"
+  },
+  "eslint.format.enable": true,
+  "eslint.lintTask.enable": true,
+  "eslint.packageManager": "yarn",
+  "jest.runAllTestsFirst": false,
+  "jest.rootPath": "./",
+  "autoimport.sourceRoot": "./app/javascript",
+  "autoimport.semicolon": false,
+  "autoimport.absolute": true
+}

Gemfile

@@ -7,20 +7,20 @@ git_source(:github) do |repo_name|
 end
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 6.1.7.3'
+gem 'rails', '~> 7.0.0'
 # 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', '~> 6.2.1'
+gem 'puma', '~> 6.4.2'
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 5.0'
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier', '>= 1.3.0'
 # See https://github.com/rails/execjs#readme for more supported runtimes
 # gem 'therubyracer', platforms: :ruby
 
-# Use CoffeeScript for .coffee assets and views
-gem 'coffee-rails', '~> 4.2'
+# As of Rails 7.0, sprocket-rails is no longer a dependency of rails itself
+gem "sprockets-rails"
 
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 2.5'
@@ -55,7 +55,7 @@ group :development, :test do
   # Workaround for cc-test-reporter with SimpleCov 0.18.
   # Stop upgrading SimpleCov until the following issue will be resolved.
   # https://github.com/codeclimate/test-reporter/issues/418
-  gem 'simplecov', '~> 0.10', '< 0.18', require: false
+  gem 'simplecov', '~> 0.22.0', require: false
   gem 'ruby-debug-ide'
   gem "debase", "0.2.5.beta2"
   # gem "debug", ">= 1.0.0"
@@ -66,8 +66,8 @@ group :development do
   gem 'web-console', '>= 3.3.0'
   gem 'listen', '>= 3.0.5', '< 3.2'
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
-  gem 'spring'
-  gem 'spring-watcher-listen', '~> 2.0.0'
+  gem 'spring', '~> 4.0.0'
+  gem 'spring-watcher-listen', '~> 2.1.0'
   gem 'overcommit'
   gem 'rails_best_practices'
   gem 'rails_layout'
@@ -82,33 +82,25 @@ 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.9.0"
 
-# Added at 2017-10-22 23:48:56 -0700 by dkaplan:
 gem "omniauth-salesforce", "~> 1.0.5"
 gem "omniauth-rails_csrf_protection"
 
-# Added at 2017-10-24 00:03:53 -0700 by dkaplan:
 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"
 
-# Added at 2017-10-29 23:29:10 -0700 by dkaplan:
-gem "webpacker", "~> 5.4.4"
+gem "shakapacker", "7.2.1"
 
-# Added at 2017-10-29 23:57:32 -0700 by dkaplan:
-gem "webpacker-react", "~> 0.3.2"
+gem "react_on_rails", "13.4.0"
 
-# Added at 2017-11-10 09:14:41 -0800 by dkaplan:
 gem "pg", "~> 1.4.6"
 
 gem 'scout_apm'
 
-gem 'oj'
+gem 'oj'