Merge branch 'main' into feature/oauth-integration

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

Author: rsmithlal

.github/copilot-instructions.md

@@ -80,6 +80,20 @@ end
 - `truncate`, `pluralize`, `excerpt`, `word_wrap`, `simple_format`.
 - For rich text (Action Text), use `record.body` and `to_plain_text` for indexing/search.
 
+### Privacy Display
+- Use `privacy_display_value(entity)` for consistent, translated privacy level display across the application.
+- This helper automatically looks up the proper translation from `attributes.privacy_list` and falls back to humanized values.
+- Supports all privacy levels: `public`, `private`, `community`, `unlisted`.
+
+```ruby
+# Instead of: entity.privacy.humanize or entity.privacy.capitalize
+<%= privacy_display_value(@event) %>      # "Public" / "Público" / "Public"
+<%= privacy_display_value(@community) %>  # "Private" / "Privado" / "Privé"
+
+# Works in badges too (automatically used)
+<%= privacy_badge(@entity) %>  # Uses privacy_display_value internally
+```
+
 ---
 
 ## 4. Navigation & Link Helpers

.github/instructions/view-helpers.instructions.md

@@ -11,11 +11,8 @@ jobs:
       matrix:
         include:
           - ruby: '3.4.4'
-            rails: '7.1.5.2'
+            rails: '7.2.2.2'
             allowed_failure: false   # ✅ required
-          - ruby: '3.4.4'
-            rails: '7.2.2.1'
-            allowed_failure: false   # ⚠️ allowed to fail
           - ruby: '3.4.4'
             rails: '8.0.2'
             allowed_failure: true    # ⚠️ allowed to fail
@@ -52,18 +49,18 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby }}
 
-          # Run the automatic bundle-install only on 7.1.
+          # Run the automatic bundle-install only on 7.2.
           # For 7.2 / 8.0 it just sets up Ruby *and* restores a cache layer
           # that we’ll reuse in the later manual install.
-          bundler-cache: ${{ matrix.rails == '7.1.5.2' }}
+          bundler-cache: ${{ matrix.rails == '7.2.2.2' }}
 
           # One cache bucket per Rails version so they don’t clobber each other.
           cache-version: rails-${{ matrix.rails }}
 
       # Updating Rails can legitimately blow up on the experimental tracks,
       # so we allow that *step* to error out without failing the job.
       - name: Update Rails & install gems
-        if: matrix.rails != '7.1.5.2'
+        if: matrix.rails != '7.2.2.2'
         id: update
         run: |
           # turn off deployment mode
@@ -75,21 +72,21 @@ jobs:
         continue-on-error: ${{ matrix.allowed_failure }}
 
       - name: Prepare DB schema
-        if: (matrix.rails == '7.1.5.2') || steps.update.outcome == 'success'
+        if: (matrix.rails == '7.2.2.2') || steps.update.outcome == 'success'
         run: |
           rm -f spec/dummy/tmp/pids/server.pid
           bundle exec rake -f spec/dummy/Rakefile db:schema:load
         continue-on-error: ${{ matrix.allowed_failure }}
 
       - name: Wait for Elasticsearch
-        if: (matrix.rails == '7.1.5.2') || steps.update.outcome == 'success'
+        if: (matrix.rails == '7.2.2.2') || steps.update.outcome == 'success'
         run: |
           echo "Waiting for Elasticsearch to be healthy..."
           curl -s "http://localhost:9200/_cluster/health?wait_for_status=yellow&timeout=60s" || (echo "Elasticsearch not healthy" && exit 1)
 
 
       - name: Run RSpec
-        if: (matrix.rails == '7.1.5.2') || steps.update.outcome == 'success'
+        if: (matrix.rails == '7.2.2.2') || steps.update.outcome == 'success'
         env:
           RAILS_MASTER_KEY: ${{ secrets.RAILS_MASTER_KEY }}
         run: |

.github/workflows/rubyonrails.yml

@@ -3,6 +3,7 @@ AllCops:
     - 'bin/*'
     - 'node_modules/**/*'
     - 'spec/dummy/db/schema.rb'
+    - 'db/schema.rb'
     - 'vendor/**/*'
   NewCops: enable
   TargetRubyVersion: 3.4
@@ -12,6 +13,21 @@ plugins:
   - rubocop-rspec_rails
   - rubocop-capybara
   - rubocop-factory_bot
+
+# Disable all RSpec cops that affect test quality but not production code
+RSpec/ExampleLength:
+  Enabled: false
+RSpec/MultipleExpectations:
+  Enabled: false
+RSpec/MultipleMemoizedHelpers:
+  Enabled: false
+RSpec/ContextWording:
+  Enabled: false
+RSpec/MessageSpies:
+  Enabled: false
+RSpec/LetSetup:
+  Enabled: false
+
 Style/StringLiterals:
   Exclude:
     - 'db/migrate/*'

.rubocop.yml

@@ -20,14 +20,14 @@ gem 'fog-aws'
 # Database adapter for PostgreSQL
 gem 'pg', '>= 0.18', '< 2.0'
 # Puma as the app server
-gem 'puma', '~> 6.6'
+gem 'puma', '~> 7.0'
 
 # Pundit for authorization, custom fork for Better Together
 gem 'pundit-resources', '~> 1.1.4', github: 'better-together-org/pundit-resources'
 
 # Core Rails gem
 gem 'rack-protection'
-gem 'rails', ENV.fetch('RAILS_VERSION', '7.1.5.2')
+gem 'rails', ENV.fetch('RAILS_VERSION', '7.2.2.2')
 
 # Redis for ActionCable and background jobs
 gem 'redis', '~> 5.4'
@@ -98,13 +98,17 @@ group :test do
   # Capybara for integration testing
   gem 'capybara', '>= 2.15'
   gem 'capybara-screenshot'
+  # WebMock for stubbing external HTTP requests in specs
+  gem 'webmock'
   # 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'
+  # Rails controller testing for assigns method
+  gem 'rails-controller-testing'
   # RuboCop RSpec for RSpec-specific code analysis
   gem 'rubocop-capybara'
   gem 'rubocop-factory_bot'
@@ -113,6 +117,7 @@ group :test do
   gem 'rubocop-rspec_rails'
   # RSpec for unit testing
   gem 'rspec'
+  gem 'rspec-rebound'
   # RSpec Rails integration
   gem 'rspec-rails'
   # Selenium WebDriver for browser automation