Merge remote-tracking branch 'parent/main' into upstream-20240118

2024-01-18 09:17:39 +09:00 · 2024-01-18 09:17:39 +09:00 · 2b51fabe9c
commit 2b51fabe9c
parent f20ebfac41 127503eb2c
397 changed files with 2899 additions and 3252 deletions
--- a/spec/policies/user_policy_spec.rb
+++ b/spec/policies/user_policy_spec.rb
@ -64,7 +64,7 @@ RSpec.describe UserPolicy do

      context 'when record.confirmed?' do
        it 'denies' do
-          john.user.confirm!
+          john.user.mark_email_as_confirmed!
          expect(subject).to_not permit(admin, john.user)
        end
      end