Merge branch 'develop' into rm-early-submission

Author: ryanwoldatwork

.circleci/config.yml

@@ -4,12 +4,12 @@
 #
 version: 2.1
 orbs:
-  browser-tools: circleci/browser-tools@1.4.8
+  browser-tools: circleci/browser-tools@1.5.0
 
 jobs:
   build:
     docker:
-       - image: cimg/ruby:3.2.4-browsers
+       - image: cimg/ruby:3.3.4-browsers
          environment:
             RAILS_ENV: test
             PGHOST: 127.0.0.1
@@ -18,7 +18,7 @@ jobs:
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
       # documented at https://circleci.com/docs/2.0/circleci-images/
-       - image: cimg/postgres:11.21
+       - image: cimg/postgres:15.8
          environment:
             POSTGRES_USER: root
             POSTGRES_DB: touchpoints_test
@@ -52,6 +52,13 @@ jobs:
       - run: bundle exec rake db:create
       - run: bundle exec rake db:schema:load
 
+      # Precompile assets (to use npm packages specified in assets.rb)
+      - run:
+          name: Precompile assets
+          command: |
+            npm i
+            rails assets:precompile
+
       # run tests!
       - run:
           name: Run tests
@@ -87,7 +94,7 @@ jobs:
 
   cron_tasks:
     docker:
-      - image: cimg/base:2024.07
+      - image: cimg/base:2025.01
     steps:
       - checkout
       - run:

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '3.2.4'
+ruby '3.3.4'
 
 # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
 gem "rails", "~> 7.2"
@@ -42,10 +42,6 @@ gem "sassc-rails"
 # Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images]
 gem "image_processing", "~> 1.12"
 
-gem "brakeman"
-gem "bundler-audit"
-gem "rubocop-rails"
-gem "rubocop-rspec"
 gem 'active_model_serializers'
 gem 'acts-as-list'
 gem 'aws-sdk-rails', '>= 3.8.0'
@@ -68,7 +64,6 @@ gem 'rack-cors', require: 'rack/cors'
 # Use Redis to cache Touchpoints in all envs
 gem 'redis-client'
 gem 'redis-namespace'
-gem 'sass-rails'
 gem 'sidekiq', '>= 6.5.0'
 gem 'json-jwt'
 gem 'aasm'
@@ -80,15 +75,17 @@ gem "rolify"
 group :development, :test do
   gem 'dotenv'
   gem 'pry'
-  gem 'rspec_junit_formatter'
 end
 
 group :development do
-  # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
   gem 'aasm-diagram'
+  gem "brakeman"
   gem 'bullet'
+  gem "bundler-audit"
   gem 'listen'
   gem 'rails-erd'
+  gem "rubocop-rails"
+  gem "rubocop-rspec"
   gem 'web-console'
 end
 
@@ -98,6 +95,7 @@ group :test do
   gem 'database_cleaner'
   gem 'factory_bot_rails'
   gem 'rails-controller-testing'
+  gem 'rspec_junit_formatter'
   gem 'rspec-rails'
   gem 'selenium-webdriver'
   gem 'simplecov', require: false