Merge branch 'main' into werebus/rubocop

umts · Oct 30, 2024 · 1dc3fae · 1dc3fae
2 parents f2effa5 + e1d061b
commit 1dc3fae
Show file tree

Hide file tree

Showing 21 changed files with 15 additions and 7 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -92,7 +92,7 @@ GEM
       capistrano (~> 3.0)
     capistrano-pending (0.2.0)
       capistrano (>= 3.2.0)
-    capistrano-rails (1.6.1)
+    capistrano-rails (1.6.3)
       capistrano (~> 3.1)
       capistrano-bundler (>= 1.1, < 3)
     capistrano-yarn (2.0.2)
@@ -203,7 +203,7 @@ GEM
     parser (3.3.5.0)
       ast (~> 2.4.1)
       racc
-    phonelib (0.9.2)
+    phonelib (0.9.3)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -297,7 +297,7 @@ GEM
       rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.32.3)
+    rubocop-ast (1.33.0)
       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
@@ -306,12 +306,12 @@ GEM
     rubocop-performance (1.22.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.26.2)
+    rubocop-rails (2.27.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.52.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (3.1.0)
+    rubocop-rspec (3.2.0)
       rubocop (~> 1.61)
     rubocop-rspec_rails (2.30.0)
       rubocop (~> 1.61)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class ApplicationController < ActionController::Base
-  before_action :check_primary_account, :set_current_user, :set_roster, :set_paper_trail_whodunnit
+  before_action :check_primary_account, :set_current_user, :set_roster
 
   def self.api_accessible(**options)
     skip_before_action :check_primary_account, :set_current_user, **options

diff --git a/app/models/current.rb b/app/models/current.rb
@@ -2,4 +2,11 @@
 
 class Current < ActiveSupport::CurrentAttributes
   attribute :user
+
+  resets { PaperTrail.request.whodunnit if PaperTrail.request.enabled? }
+
+  def user=(user)
+    PaperTrail.request.whodunnit = user&.id if PaperTrail.request.enabled?
+    super
+  end
 end
diff --git a/app/views/assignments/_current.haml → app/views/assignments/_current.html.haml b/app/views/assignments/_current.haml → app/views/assignments/_current.html.haml
diff --git a/app/views/assignments/_your_assignments.haml → ...s/assignments/_your_assignments.html.haml b/app/views/assignments/_your_assignments.haml → ...s/assignments/_your_assignments.html.haml
diff --git a/app/views/assignments/edit.haml → app/views/assignments/edit.html.haml b/app/views/assignments/edit.haml → app/views/assignments/edit.html.haml
diff --git a/app/views/assignments/new.haml → app/views/assignments/new.html.haml b/app/views/assignments/new.haml → app/views/assignments/new.html.haml
diff --git a/...views/assignments/rotation_generator.haml → .../assignments/rotation_generator.html.haml b/...views/assignments/rotation_generator.haml → .../assignments/rotation_generator.html.haml
diff --git a/app/views/layouts/_nav.haml → app/views/layouts/_nav.html.haml b/app/views/layouts/_nav.haml → app/views/layouts/_nav.html.haml
diff --git a/app/views/layouts/application.haml → app/views/layouts/application.html.haml b/app/views/layouts/application.haml → app/views/layouts/application.html.haml
diff --git a/app/views/rosters/edit.haml → app/views/rosters/edit.html.haml b/app/views/rosters/edit.haml → app/views/rosters/edit.html.haml
diff --git a/app/views/rosters/index.haml → app/views/rosters/index.html.haml b/app/views/rosters/index.haml → app/views/rosters/index.html.haml
diff --git a/app/views/rosters/new.haml → app/views/rosters/new.html.haml b/app/views/rosters/new.haml → app/views/rosters/new.html.haml
diff --git a/app/views/rosters/setup.haml → app/views/rosters/setup.html.haml b/app/views/rosters/setup.haml → app/views/rosters/setup.html.haml
diff --git a/app/views/sessions/dev_login.haml → app/views/sessions/dev_login.html.haml b/app/views/sessions/dev_login.haml → app/views/sessions/dev_login.html.haml
diff --git a/app/views/sessions/unauthenticated.haml → app/views/sessions/unauthenticated.html.haml b/app/views/sessions/unauthenticated.haml → app/views/sessions/unauthenticated.html.haml
diff --git a/app/views/users/edit.haml → app/views/users/edit.html.haml b/app/views/users/edit.haml → app/views/users/edit.html.haml
diff --git a/app/views/users/index.haml → app/views/users/index.html.haml b/app/views/users/index.haml → app/views/users/index.html.haml
diff --git a/app/views/users/new.haml → app/views/users/new.html.haml b/app/views/users/new.haml → app/views/users/new.html.haml
diff --git a/coverage/.last_run.json b/coverage/.last_run.json
@@ -1,5 +1,5 @@
 {
   "result": {
-    "line": 99.25
+    "line": 99.26
   }
 }
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -10,6 +10,7 @@
 require 'rspec/rails'
 require 'rack_session_access/capybara'
 require 'umts_custom_matchers'
+require 'paper_trail/frameworks/rspec'
 
 ActiveRecord::Migration.maintain_test_schema!
 Timecop.safe_mode = true