merge for 7.4.2

.github/workflows/ruby.yml

@@ -36,7 +36,7 @@ jobs:
       uses: ruby/setup-ruby@v1
       # uses: ruby/setup-ruby@b12138f02d7d0c4d36f463e0885dc47ec25a52fe
       with:
-        ruby-version: 3.3.8
+        ruby-version: 3.4.5
     - name: Install dependencies
       run: |
         bundle install
@@ -57,7 +57,7 @@ jobs:
       uses: ruby/setup-ruby@v1
       # uses: ruby/setup-ruby@b12138f02d7d0c4d36f463e0885dc47ec25a52fe
       with:
-        ruby-version: 3.3.8
+        ruby-version: 3.4.5
     - name: Install dependencies
       run: |
         . $HOME/.nvm/nvm.sh
@@ -91,7 +91,7 @@ jobs:
       uses: ruby/setup-ruby@v1
       # uses: ruby/setup-ruby@b12138f02d7d0c4d36f463e0885dc47ec25a52fe
       with:
-        ruby-version: 3.3.8
+        ruby-version: 3.4.5
     - name: Install dependencies
       run: |
         . $HOME/.nvm/nvm.sh
@@ -134,7 +134,7 @@ jobs:
       uses: ruby/setup-ruby@v1
       # uses: ruby/setup-ruby@b12138f02d7d0c4d36f463e0885dc47ec25a52fe
       with:
-        ruby-version: 3.3.8
+        ruby-version: 3.4.5
     - name: Install dependencies
       run: |
         . $HOME/.nvm/nvm.sh
@@ -150,14 +150,14 @@ jobs:
         timeout_minutes: 30
         max_attempts: 2
         retry_on: error
-        command: bundle exec cucumber features/products/ features/program_tests/ features/records/ features/users/ features/vendors/;
+        command: bundle exec cucumber features/products/ features/program_tests/ features/users/ features/vendors/;
     - name: Upload code coverage to codecov.io
       uses: codecov/codecov-action@v3
       with:
         directory: coverage
         name: codecov-cucumber-2
 
-  unit-test:
+  cucumber-3:
     strategy:
       fail-fast: false
 
@@ -177,7 +177,7 @@ jobs:
       uses: ruby/setup-ruby@v1
       # uses: ruby/setup-ruby@b12138f02d7d0c4d36f463e0885dc47ec25a52fe
       with:
-        ruby-version: 3.3.8
+        ruby-version: 3.4.5
     - name: Install dependencies
       run: |
         . $HOME/.nvm/nvm.sh
@@ -187,15 +187,125 @@ jobs:
         git clone -b cypress_v7 https://github.com/projecttacoma/cqm-execution-service.git /tmp/cqm-execution-service-56
         yarn --cwd /tmp/cqm-execution-service-56 install --only=production
         yarn --cwd /tmp/cqm-execution-service-56 start &
-    - name: Run Rake test
+    - name: Run cucumber
+      uses: nick-fields/retry@v2
+      with:
+        timeout_minutes: 30
+        max_attempts: 2
+        retry_on: error
+        command: bundle exec cucumber features/records/;
+    - name: Upload code coverage to codecov.io
+      uses: codecov/codecov-action@v3
+      with:
+        directory: coverage
+        name: codecov-cucumber-3
+
+  unit-test-1:
+    strategy:
+      fail-fast: false
+
+    runs-on: ubuntu-22.04
+
+    services:
+      mongodb:
+        image: mongo:7.0.6
+        ports:
+          - 27017:27017
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+      uses: ruby/setup-ruby@v1
+      # uses: ruby/setup-ruby@b12138f02d7d0c4d36f463e0885dc47ec25a52fe
+      with:
+        ruby-version: 3.4.5
+    - name: Install dependencies
+      run: |
+        . $HOME/.nvm/nvm.sh
+        nvm install 22.16
+        nvm use stable
+        bundle install
+        git clone -b cypress_v7 https://github.com/projecttacoma/cqm-execution-service.git /tmp/cqm-execution-service-56
+        yarn --cwd /tmp/cqm-execution-service-56 install --only=production
+        yarn --cwd /tmp/cqm-execution-service-56 start &
+    - name: Run Rake test units
+      run: |
+        RUBYOPT="-W0"
+        bin/rails test test/unit/*.rb;
+    - name: Upload code coverage to codecov.io
+      uses: codecov/codecov-action@v3
+      with:
+        directory: coverage
+        name: codecov-unit-1
+
+  unit-test-2:
+    strategy:
+      fail-fast: false
+
+    runs-on: ubuntu-22.04
+
+    services:
+      mongodb:
+        image: mongo:7.0.6
+        ports:
+          - 27017:27017
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+      uses: ruby/setup-ruby@v1
+      # uses: ruby/setup-ruby@b12138f02d7d0c4d36f463e0885dc47ec25a52fe
+      with:
+        ruby-version: 3.4.5
+    - name: Install dependencies
+      run: |
+        . $HOME/.nvm/nvm.sh
+        nvm install 22.16
+        nvm use stable
+        bundle install
+        git clone -b cypress_v7 https://github.com/projecttacoma/cqm-execution-service.git /tmp/cqm-execution-service-56
+        yarn --cwd /tmp/cqm-execution-service-56 install --only=production
+        yarn --cwd /tmp/cqm-execution-service-56 start &
+    - name: Run Rake test units lib
+      run: |
+        RUBYOPT="-W0"
+        bin/rails test test/unit/lib/*.rb;
+    - name: Upload code coverage to codecov.io
+      uses: codecov/codecov-action@v3
+      with:
+        directory: coverage
+        name: codecov-unit-2-lib
+    - name: Run Rake test units lib cypress
+      run: |
+        RUBYOPT="-W0"
+        bin/rails test test/unit/lib/cypress/*.rb;
+    - name: Upload code coverage to codecov.io
+      uses: codecov/codecov-action@v3
+      with:
+        directory: coverage
+        name: codecov-unit-2-lib-cypress
+    - name: Run Rake test units lib validators
+      run: |
+        RUBYOPT="-W0"
+        bin/rails test test/unit/lib/validators/*.rb;
+    - name: Upload code coverage to codecov.io
+      uses: codecov/codecov-action@v3
+      with:
+        directory: coverage
+        name: codecov-unit-2-validators
+    - name: Run Rake test models
       run: |
         RUBYOPT="-W0"
-        bundle exec rake test:units;
+        bin/rails test test/models;
     - name: Upload code coverage to codecov.io
       uses: codecov/codecov-action@v3
       with:
         directory: coverage
-        name: codecov-unit
+        name: codecov-unit-2-models
 
   controllers-jobs-helpers-test:
     strategy:
@@ -217,7 +327,7 @@ jobs:
       uses: ruby/setup-ruby@v1
       # uses: ruby/setup-ruby@b12138f02d7d0c4d36f463e0885dc47ec25a52fe
       with:
-        ruby-version: 3.3.8
+        ruby-version: 3.4.5
     - name: Install dependencies
       run: |
         . $HOME/.nvm/nvm.sh
@@ -275,7 +385,7 @@ jobs:
       uses: ruby/setup-ruby@v1
       # uses: ruby/setup-ruby@b12138f02d7d0c4d36f463e0885dc47ec25a52fe
       with:
-        ruby-version: 3.3.8
+        ruby-version: 3.4.5
     - name: Install dependencies
       run: |
         . $HOME/.nvm/nvm.sh

.overcommit.yml

@@ -27,7 +27,8 @@ PreCommit:
     enabled: true
     exclude: ['vendor/assets/javascripts/**/*', 'test/fixtures/**/*']
   ScssLint:
-    enabled: true
+    # disable scss_lint check, incompatible with upgraded sass dependencies
+    enabled: false
     exclude: ['vendor/assets/stylesheets/**/*']
   HardTabs:
     enabled: true

.pkgr.yml

@@ -1,5 +1,6 @@
 env:
   - DISABLE_DB=true
+  - SECRET_KEY_BASE_DUMMY=1
 dependencies:
   - libcurl4
 before:

.ruby-version

@@ -1 +1 @@
-3.3.8
+3.4.5

Dockerfile

@@ -1,7 +1,7 @@
 ############################################
 #  🏗  Stage 1 – build gems + assets
 ############################################
-FROM ruby:3.3.8-slim AS builder
+FROM ruby:3.4.5-slim AS builder
 
 # Essential OS packages (compile + JS pipeline)
 # RUN apt-get update
@@ -32,7 +32,7 @@ RUN RAILS_ENV=production DISABLE_DB=true SECRET_KEY_BASE=precompile_only bundle
 ################################################
 #  🏃‍♂️  Stage 2 – production image
 ################################################
-FROM ruby:3.3.8-slim AS prod
+FROM ruby:3.4.5-slim AS prod
 
 # ➜ install only the shared lib, not the dev headers
 RUN --mount=type=cache,target=/var/cache/apt \
@@ -68,7 +68,7 @@ CMD ["/usr/local/bin/docker_entrypoint.sh"]
 ############################################
 #  🏗  Stage 3 – development environment
 ############################################
-FROM ruby:3.3.8-slim AS dev
+FROM ruby:3.4.5-slim AS dev
 
 # Essential OS packages (compile + JS pipeline)
 RUN apt-get update && \

Gemfile

@@ -2,13 +2,13 @@
 
 source 'https://rubygems.org'
 
-ruby '3.3.8'
+ruby '3.4.5'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 7.2.0'
+gem 'rails', '~> 8.0', '>= 8.0.2.1'
 
 gem 'delayed_job_mongoid', '~> 3.0.0'
-gem 'mongoid', '~> 8.1.0'
+gem 'mongoid', '~> 9.0.0'
 
 # gem 'mongoid', '~> 4.0.2'
 gem 'bson'
@@ -17,21 +17,20 @@ gem 'mustache'
 ## gem 'os'
 
 gem 'cqm-models', '~> 4.2.0'
-gem 'cqm-parsers', '~> 4.1.1.1'
-gem 'cqm-reports', '~> 4.1.4'
+gem 'cqm-parsers', '~> 4.1.1.2'
+gem 'cqm-reports', '~> 4.1.5'
 gem 'cqm-validators', '~> 4.0.6'
 
 # # Use faker to generate addresses
 gem 'faker', '> 1.5.0'
 
-# Use SCSS for stylesheets
-gem 'sass-rails', '~> 5.0.4'
+gem 'csv', '~> 3.3', '>= 3.3.5'
+
 # Dependencies for CMS Assets Framework
-# gem 'bootstrap-sass', '~> 3.4.1'
-gem 'bootstrap', '~> 5.3.3'
-gem 'dartsass-sprockets'
+gem 'bootstrap', '~> 5.3.5'
+gem 'dartsass-sprockets', '~> 3.2', '>= 3.2.1'
 
-gem 'font-awesome-sass', '~> 5.0.13'
+gem 'font-awesome-sass', '~> 6.7', '>= 6.7.2'
 gem 'jquery-rails'
 # TODO: remove or use gem
 gem 'jquery-ui-rails', '~> 8.0.0'
@@ -44,9 +43,8 @@ gem 'uglifier', '>= 1.3.0'
 # Bake the best breadcrumbs
 gem 'breadcrumbs_on_rails'
 # Help our forms
-gem 'bootstrap_form', '~> 2.7'
+gem 'bootstrap_form', '~> 5.4'
 gem 'jasny-bootstrap-rails'
-gem 'nested_form'
 
 gem 'jquery-datatables-rails'
 gem 'local_time', '~> 2.0.0'
@@ -57,7 +55,7 @@ gem 'local_time', '~> 2.0.0'
 # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
 gem 'turbolinks', git: 'https://github.com/turbolinks/turbolinks-classic', branch: 'master'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 2.11.0'
+gem 'jbuilder', '~> 2.14', '>= 2.14.1'
 # A set of responders modules to dry up your Rails 4.2+ app.
 gem 'responders'
 # Roar is a framework for parsing and rendering REST documents
@@ -88,8 +86,8 @@ gem 'devise'
 gem 'devise_invitable'
 gem 'rolify'
 
-# Use Unicorn as the app server
-# gem 'unicorn'
+# Use Puma as the app server
+gem 'puma', '~> 6.6'
 
 # Use Capistrano for deployment
 # gem 'capistrano-rails', group: :development
@@ -104,8 +102,8 @@ gem 'validate_url'
 gem 'telephone_number'
 
 group :development, :test do
-  # rubocop 0.67 currently has a bug that is causing it to crash in product.rb and vendor.rb
-  gem 'rubocop'
+  # pin rubocop to version 1.69.1, to avoid new errors in overcommit from later verisons
+  gem 'rubocop', '1.69.1'
   gem 'rubocop-rspec'
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'axe-core-capybara'
@@ -123,8 +121,10 @@ group :development, :test do
   gem 'rails_best_practices'
   gem 'rails-controller-testing'
   gem 'rails-perftest'
-  gem 'scss_lint', require: false
+  # remove scss_lint, incompatible with sass dependency upgrades
+  # gem 'scss_lint', require: false
   gem 'selenium-webdriver'
+  gem 'webrick'
 end
 
 group :development do
@@ -153,9 +153,4 @@ end
 
 group :production do
   gem 'newrelic_rpm'
-  gem 'unicorn-rails'
-end
-
-group :docker do
-  gem 'puma', '~> 6.6'
 end