Merge branch 'main' into feature/metrics/rich-text-links

Signed-off-by: Robert Smith <[email protected]>

Author: rsmithlal

.github/workflows/rubyonrails.yml

@@ -7,9 +7,9 @@
 name: "Ruby on Rails CI"
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "main", "dev" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main", "dev" ]
 jobs:
   rspec:
     runs-on: ubuntu-latest
@@ -42,7 +42,7 @@ jobs:
         uses: actions/checkout@v3
       # Add or replace dependency steps here
       - name: Install Ruby and gems
-        uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0
+        uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
       # Add or replace database setup steps here
@@ -58,7 +58,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
       - name: Install Ruby and gems
-        uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0
+        uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
       - name: Lint Ruby files with Rubocop
@@ -70,7 +70,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
       - name: Install Ruby and gems
-        uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0
+        uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
       - name: Generate binstubs

Dockerfile.dev

@@ -2,16 +2,23 @@
 
 FROM ruby:3.2.2
 
+# Add system dependencies needed for building gems, running JS, and running Chrome Headless
 RUN apt-get update -qq \
   && apt-get install -y build-essential postgresql-client libpq-dev \
-  nodejs libssl-dev apt-transport-https ca-certificates libvips42 nano
+  nodejs libssl-dev apt-transport-https ca-certificates libvips42 nano \
+  chromium chromium-driver
 
+# Create app directory
 RUN mkdir /community-engine
 WORKDIR /community-engine
+
+# Pre-bundle install step
 COPY Gemfile /community-engine/Gemfile
 COPY Gemfile.lock /community-engine/Gemfile.lock
 
+# Use specific Bundler version (you could also lock this in your Gemfile.lock instead)
 RUN gem uninstall bundler
 RUN gem install bundler:2.4.13
 
+# Copy entire app source (this assumes you're using volume mounting during development)
 COPY . /community-engine

Gemfile

@@ -20,7 +20,7 @@ gem 'fog-aws'
 # Database adapter for PostgreSQL
 gem 'pg', '>= 0.18', '< 2.0'
 # Puma as the app server
-gem 'puma', '~> 6.4'
+gem 'puma', '~> 6.6'
 
 # Pundit for authorization, custom fork for Better Together
 gem 'pundit-resources', '~> 1.1.4', github: 'better-together-org/pundit-resources'
@@ -30,12 +30,12 @@ gem 'rack-protection'
 gem 'rails', '~> 7.1.3'
 
 # Redis for ActionCable and background jobs
-gem 'redis', '~> 5.3'
+gem 'redis', '~> 5.4'
 
 gem 'rswag'
 
 # Sidekiq for background processing
-gem 'sidekiq', '~> 7.3.2'
+gem 'sidekiq', '~> 7.3.9'
 
 # Error and performance monitoring with Sentry
 gem 'sentry-rails'
@@ -97,13 +97,14 @@ end
 group :test do
   # Capybara for integration testing
   gem 'capybara', '>= 2.15'
+  gem 'capybara-screenshot'
   # Coveralls for test coverage reporting
   gem 'coveralls_reborn', require: false
   # Database cleaner for test database cleaning
   gem 'database_cleaner'
   gem 'database_cleaner-active_record'
   # # Easy installation and use of chromedriver to run system tests with Chrome
-  gem 'webdrivers'
+  # gem 'webdrivers'
   # RuboCop RSpec for RSpec-specific code analysis
   gem 'rubocop-rspec'
   # RSpec for unit testing