diff --git a/.rubocop.yml b/.rubocop.yml
index 583a0c21741b6d..14b868a5f74698 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -108,12 +108,6 @@ Rails/FilePath:
 Rails/HttpStatus:
   EnforcedStyle: numeric
 
-# Reason: Allowed in boot ENV checker
-# https://docs.rubocop.org/rubocop-rails/cops_rails.html#railsexit
-Rails/Exit:
-  Exclude:
-    - 'config/boot.rb'
-
 # Reason: Conflicts with `Lint/UselessMethodDefinition` for inherited controller actions
 # https://docs.rubocop.org/rubocop-rails/cops_rails.html#railslexicallyscopedactionfilter
 Rails/LexicallyScopedActionFilter:
diff --git a/Gemfile.lock b/Gemfile.lock
index 48544384b1f12c..cc41a6096554ec 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -219,7 +219,7 @@ GEM
     docile (1.4.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    doorkeeper (5.6.8)
+    doorkeeper (5.6.9)
       railties (>= 5)
     dotenv (2.8.1)
     dotenv-rails (2.8.1)
@@ -813,7 +813,7 @@ GEM
     xorcist (1.1.3)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.12)
+    zeitwerk (2.6.13)
 
 PLATFORMS
   ruby
diff --git a/app/models/account.rb b/app/models/account.rb
index ca4ad3c4a9a15d..77aac3215339ed 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -92,9 +92,9 @@ class Account < ApplicationRecord
   include DomainNormalizable
   include Paginable
 
-  enum protocol: { ostatus: 0, activitypub: 1 }
-  enum suspension_origin: { local: 0, remote: 1 }, _prefix: true
-  enum searchability: { public: 0, private: 1, direct: 2, limited: 3, unsupported: 4, public_unlisted: 10 }, _suffix: :searchability
+  enum :protocol, { ostatus: 0, activitypub: 1 }
+  enum :suspension_origin, { local: 0, remote: 1 }, prefix: true
+  enum :searchability, { public: 0, private: 1, direct: 2, limited: 3, unsupported: 4, public_unlisted: 10 }, suffix: :searchability
 
   validates :username, presence: true
   validates_with UniqueUsernameValidator, if: -> { will_save_change_to_username? }
diff --git a/app/models/account_warning.rb b/app/models/account_warning.rb
index 5db5915a6e51c1..c8e083a24e9543 100644
--- a/app/models/account_warning.rb
+++ b/app/models/account_warning.rb
@@ -17,7 +17,7 @@
 #
 
 class AccountWarning < ApplicationRecord
-  enum action: {
+  enum :action, {
     none: 0,
     disable: 1_000,
     force_cw: 1_200,
@@ -26,7 +26,7 @@ class AccountWarning < ApplicationRecord
     sensitive: 2_000,
     silence: 3_000,
     suspend: 4_000,
-  }, _suffix: :action
+  }, suffix: :action
 
   normalizes :text, with: ->(text) { text.to_s }, apply_to_nil: true
 
diff --git a/app/models/bulk_import.rb b/app/models/bulk_import.rb
index 406fb2aba26c7a..4cd228705a860a 100644
--- a/app/models/bulk_import.rb
+++ b/app/models/bulk_import.rb
@@ -24,7 +24,7 @@ class BulkImport < ApplicationRecord
   belongs_to :account
   has_many :rows, class_name: 'BulkImportRow', inverse_of: :bulk_import, dependent: :delete_all
 
-  enum type: {
+  enum :type, {
     following: 0,
     blocking: 1,
     muting: 2,
@@ -33,7 +33,7 @@ class BulkImport < ApplicationRecord
     lists: 5,
   }
 
-  enum state: {
+  enum :state, {
     unconfirmed: 0,
     scheduled: 1,
     in_progress: 2,
diff --git a/app/models/custom_filter.rb b/app/models/custom_filter.rb
index 4125c1850266f2..d0ef9f93270006 100644
--- a/app/models/custom_filter.rb
+++ b/app/models/custom_filter.rb
@@ -35,7 +35,7 @@ class CustomFilter < ApplicationRecord
   include Expireable
   include Redisable
 
-  enum action: { warn: 0, hide: 1, half_warn: 2 }, _suffix: :action
+  enum :action, { warn: 0, hide: 1, half_warn: 2 }, suffix: :action
 
   belongs_to :account
   has_many :keywords, class_name: 'CustomFilterKeyword', inverse_of: :custom_filter, dependent: :destroy
diff --git a/app/models/domain_block.rb b/app/models/domain_block.rb
index a1e6efe33641f5..350479ddc3c238 100644
--- a/app/models/domain_block.rb
+++ b/app/models/domain_block.rb
@@ -32,7 +32,7 @@ class DomainBlock < ApplicationRecord
   include DomainNormalizable
   include DomainMaterializable
 
-  enum severity: { silence: 0, suspend: 1, noop: 2 }
+  enum :severity, { silence: 0, suspend: 1, noop: 2 }
 
   validates :domain, presence: true, uniqueness: true, domain: true
 
diff --git a/app/models/friend_domain.rb b/app/models/friend_domain.rb
index 084250003303de..88ebd9338b31ef 100644
--- a/app/models/friend_domain.rb
+++ b/app/models/friend_domain.rb
@@ -23,8 +23,8 @@ class FriendDomain < ApplicationRecord
   validates :domain, presence: true, uniqueness: true, if: :will_save_change_to_domain?
   validates :inbox_url, presence: true, uniqueness: true, if: :will_save_change_to_inbox_url?
 
-  enum active_state: { idle: 0, pending: 1, accepted: 2, rejected: 3 }, _prefix: :i_am
-  enum passive_state: { idle: 0, pending: 1, accepted: 2, rejected: 3 }, _prefix: :they_are
+  enum :active_state, { idle: 0, pending: 1, accepted: 2, rejected: 3 }, prefix: :i_am
+  enum :passive_state, { idle: 0, pending: 1, accepted: 2, rejected: 3 }, prefix: :they_are
 
   scope :by_domain_and_subdomains, ->(domain) { where(domain: Instance.by_domain_and_subdomains(domain).select(:domain)) }
   scope :enabled, -> { where(active_state: :accepted).or(FriendDomain.where(passive_state: :accepted)).where(available: true) }
diff --git a/app/models/import.rb b/app/models/import.rb
index 7cd6cccf7cec0b..4bdb392014b70d 100644
--- a/app/models/import.rb
+++ b/app/models/import.rb
@@ -28,7 +28,7 @@ class Import < ApplicationRecord
 
   belongs_to :account
 
-  enum type: { following: 0, blocking: 1, muting: 2, domain_blocking: 3, bookmarks: 4 }
+  enum :type, { following: 0, blocking: 1, muting: 2, domain_blocking: 3, bookmarks: 4 }
 
   validates :type, presence: true
 
diff --git a/app/models/ip_block.rb b/app/models/ip_block.rb
index 99783050b8aac7..9def5b0cde1016 100644
--- a/app/models/ip_block.rb
+++ b/app/models/ip_block.rb
@@ -19,7 +19,7 @@ class IpBlock < ApplicationRecord
   include Expireable
   include Paginable
 
-  enum severity: {
+  enum :severity, {
     sign_up_requires_approval: 5000,
     sign_up_block: 5500,
     no_access: 9999,
diff --git a/app/models/list.rb b/app/models/list.rb
index 5d349a731aeace..7205e9052f920f 100644
--- a/app/models/list.rb
+++ b/app/models/list.rb
@@ -19,7 +19,7 @@ class List < ApplicationRecord
 
   PER_ACCOUNT_LIMIT = 50
 
-  enum replies_policy: { list: 0, followed: 1, none: 2 }, _prefix: :show
+  enum :replies_policy, { list: 0, followed: 1, none: 2 }, prefix: :show
 
   belongs_to :account, optional: true
 
diff --git a/app/models/login_activity.rb b/app/models/login_activity.rb
index 2b7b37f8e499f6..654dd623ad13ca 100644
--- a/app/models/login_activity.rb
+++ b/app/models/login_activity.rb
@@ -16,7 +16,7 @@
 #
 
 class LoginActivity < ApplicationRecord
-  enum authentication_method: { password: 'password', otp: 'otp', webauthn: 'webauthn', sign_in_token: 'sign_in_token', omniauth: 'omniauth' }
+  enum :authentication_method, { password: 'password', otp: 'otp', webauthn: 'webauthn', sign_in_token: 'sign_in_token', omniauth: 'omniauth' }
 
   belongs_to :user
 
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
index 809411c73429f9..54dece0e7a5f50 100644
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@ -39,8 +39,8 @@ class MediaAttachment < ApplicationRecord
   LOCAL_STATUS_ATTACHMENT_MAX_WITH_POLL = 4
   ACTIVITYPUB_STATUS_ATTACHMENT_MAX = 16
 
-  enum type: { image: 0, gifv: 1, video: 2, unknown: 3, audio: 4 }
-  enum processing: { queued: 0, in_progress: 1, complete: 2, failed: 3 }, _prefix: true
+  enum :type, { image: 0, gifv: 1, video: 2, unknown: 3, audio: 4 }
+  enum :processing, { queued: 0, in_progress: 1, complete: 2, failed: 3 }, prefix: true
 
   MAX_DESCRIPTION_LENGTH = 1_500
 
diff --git a/app/models/ngword_history.rb b/app/models/ngword_history.rb
index ed821891a9396b..c22f13cd282808 100644
--- a/app/models/ngword_history.rb
+++ b/app/models/ngword_history.rb
@@ -17,6 +17,6 @@
 class NgwordHistory < ApplicationRecord
   include Paginable
 
-  enum target_type: { status: 0, account_note: 1, account_name: 2 }, _suffix: :blocked
-  enum reason: { ng_words: 0, ng_words_for_stranger_mention: 1, hashtag_count: 2, mention_count: 3, stranger_mention_count: 4 }, _prefix: :within
+  enum :target_type, { status: 0, account_note: 1, account_name: 2 }, suffix: :blocked
+  enum :reason, { ng_words: 0, ng_words_for_stranger_mention: 1, hashtag_count: 2, mention_count: 3, stranger_mention_count: 4 }, prefix: :within
 end
diff --git a/app/models/preview_card.rb b/app/models/preview_card.rb
index 83759274306cf3..9fe02bd1681014 100644
--- a/app/models/preview_card.rb
+++ b/app/models/preview_card.rb
@@ -47,8 +47,8 @@ class PreviewCard < ApplicationRecord
 
   self.inheritance_column = false
 
-  enum type: { link: 0, photo: 1, video: 2, rich: 3 }
-  enum link_type: { unknown: 0, article: 1 }
+  enum :type, { link: 0, photo: 1, video: 2, rich: 3 }
+  enum :link_type, { unknown: 0, article: 1 }
 
   has_many :preview_cards_statuses, dependent: :delete_all, inverse_of: :preview_card
   has_many :statuses, through: :preview_cards_statuses
diff --git a/app/models/relay.rb b/app/models/relay.rb
index 8d697b891f9360..f652b4864b66c0 100644
--- a/app/models/relay.rb
+++ b/app/models/relay.rb
@@ -15,7 +15,7 @@
 class Relay < ApplicationRecord
   validates :inbox_url, presence: true, uniqueness: true, url: true, if: :will_save_change_to_inbox_url?
 
-  enum state: { idle: 0, pending: 1, accepted: 2, rejected: 3 }
+  enum :state, { idle: 0, pending: 1, accepted: 2, rejected: 3 }
 
   scope :enabled, -> { accepted }
 
diff --git a/app/models/report.rb b/app/models/report.rb
index 1b132753b515f5..df7e3d2efc0f62 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -55,7 +55,7 @@ class Report < ApplicationRecord
   # - app/javascript/mastodon/features/notifications/components/report.jsx
   # - app/javascript/mastodon/features/report/category.jsx
   # - app/javascript/mastodon/components/admin/ReportReasonSelector.jsx
-  enum category: {
+  enum :category, {
     other: 0,
     spam: 1_000,
     legal: 1_500,
diff --git a/app/models/software_update.rb b/app/models/software_update.rb
index 4aeb7e665b7f84..80ea493eb38d18 100644
--- a/app/models/software_update.rb
+++ b/app/models/software_update.rb
@@ -16,7 +16,7 @@
 class SoftwareUpdate < ApplicationRecord
   self.inheritance_column = nil
 
-  enum type: { patch: 0, minor: 1, major: 2 }, _suffix: :type
+  enum :type, { patch: 0, minor: 1, major: 2 }, suffix: :type
 
   def gem_version
     Gem::Version.new(version)
diff --git a/app/models/status.rb b/app/models/status.rb
index 9fa6860981849e..27fc522290d39b 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -58,9 +58,9 @@ class Status < ApplicationRecord
   update_index('statuses', :proper)
   update_index('public_statuses', :proper)
 
-  enum visibility: { public: 0, unlisted: 1, private: 2, direct: 3, limited: 4, public_unlisted: 10, login: 11 }, _suffix: :visibility
-  enum searchability: { public: 0, private: 1, direct: 2, limited: 3, unsupported: 4, public_unlisted: 10 }, _suffix: :searchability
-  enum limited_scope: { none: 0, mutual: 1, circle: 2, personal: 3, reply: 4 }, _suffix: :limited
+  enum :visibility, { public: 0, unlisted: 1, private: 2, direct: 3, limited: 4, public_unlisted: 10, login: 11 }, suffix: :visibility
+  enum :searchability, { public: 0, private: 1, direct: 2, limited: 3, unsupported: 4, public_unlisted: 10 }, suffix: :searchability
+  enum :limited_scope, { none: 0, mutual: 1, circle: 2, personal: 3, reply: 4 }, suffix: :limited
 
   belongs_to :application, class_name: 'Doorkeeper::Application', optional: true
 
diff --git a/config/boot.rb b/config/boot.rb
index 717de85f20f5e7..70ffe22c04d979 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,8 +1,15 @@
 # frozen_string_literal: true
 
 unless ENV.key?('RAILS_ENV')
-  warn 'ERROR: Missing RAILS_ENV environment variable, please set it to "production", "development", or "test".'
-  exit 1
+  abort <<~ERROR
+    The RAILS_ENV environment variable is not set.
+
+    Please set it correctly depending on context:
+
+      - Use "production" for a live deployment of the application
+      - Use "development" for local feature work
+      - Use "test" when running the automated spec suite
+  ERROR
 end
 
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
diff --git a/spec/controllers/admin/disputes/appeals_controller_spec.rb b/spec/controllers/admin/disputes/appeals_controller_spec.rb
index f830c3b95c974c..d36523316746aa 100644
--- a/spec/controllers/admin/disputes/appeals_controller_spec.rb
+++ b/spec/controllers/admin/disputes/appeals_controller_spec.rb
@@ -30,21 +30,19 @@
   end
 
   describe 'POST #approve' do
+    subject { post :approve, params: { id: appeal.id } }
+
     let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
 
-    before do
-      post :approve, params: { id: appeal.id }
-    end
+    it 'redirects back to the strike page and notifies target account about approved appeal', :sidekiq_inline do
+      subject
 
-    it 'unsuspends a suspended account' do
-      expect(target_account.reload.suspended?).to be false
-    end
+      expect(response)
+        .to redirect_to(disputes_strike_path(appeal.strike))
 
-    it 'redirects back to the strike page' do
-      expect(response).to redirect_to(disputes_strike_path(appeal.strike))
-    end
+      expect(target_account.reload)
+        .to_not be_suspended
 
-    it 'notifies target account about approved appeal', :sidekiq_inline do
       expect(UserMailer.deliveries.size).to eq(1)
       expect(UserMailer.deliveries.first.to.first).to eq(target_account.user.email)
       expect(UserMailer.deliveries.first.subject).to eq(I18n.t('user_mailer.appeal_approved.subject', date: I18n.l(appeal.created_at)))
@@ -52,17 +50,16 @@
   end
 
   describe 'POST #reject' do
+    subject { post :reject, params: { id: appeal.id } }
+
     let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
 
-    before do
-      post :reject, params: { id: appeal.id }
-    end
+    it 'redirects back to the strike page and notifies target account about rejected appeal', :sidekiq_inline do
+      subject
 
-    it 'redirects back to the strike page' do
-      expect(response).to redirect_to(disputes_strike_path(appeal.strike))
-    end
+      expect(response)
+        .to redirect_to(disputes_strike_path(appeal.strike))
 
-    it 'notifies target account about rejected appeal', :sidekiq_inline do
       expect(UserMailer.deliveries.size).to eq(1)
       expect(UserMailer.deliveries.first.to.first).to eq(target_account.user.email)
       expect(UserMailer.deliveries.first.subject).to eq(I18n.t('user_mailer.appeal_rejected.subject', date: I18n.l(appeal.created_at)))
diff --git a/spec/controllers/auth/sessions_controller_spec.rb b/spec/controllers/auth/sessions_controller_spec.rb
index b663f55afacd51..dcbaf1fcbb78c9 100644
--- a/spec/controllers/auth/sessions_controller_spec.rb
+++ b/spec/controllers/auth/sessions_controller_spec.rb
@@ -57,11 +57,9 @@
           post :create, params: { user: { email: 'pam_user1', password: '123456' } }
         end
 
-        it 'redirects to home' do
+        it 'redirects to home and logs the user in' do
           expect(response).to redirect_to(root_path)
-        end
 
-        it 'logs the user in' do
           expect(controller.current_user).to be_instance_of(User)
         end
       end
@@ -71,11 +69,9 @@
           post :create, params: { user: { email: 'pam_user1', password: 'WRONGPW' } }
         end
 
-        it 'shows a login error' do
+        it 'shows a login error and does not log the user in' do
           expect(flash[:alert]).to match I18n.t('devise.failure.invalid', authentication_keys: I18n.t('activerecord.attributes.user.email'))
-        end
 
-        it "doesn't log the user in" do
           expect(controller.current_user).to be_nil
         end
       end
@@ -92,11 +88,9 @@
           post :create, params: { user: { email: user.email, password: '123456' } }
         end
 
-        it 'redirects to home' do
+        it 'redirects to home and logs the user in' do
           expect(response).to redirect_to(root_path)
-        end
 
-        it 'logs the user in' do
           expect(controller.current_user).to eq user
         end
       end
@@ -110,16 +104,16 @@
           post :create, params: { user: { email: user.email, password: user.password } }
         end
 
-        it 'redirects to home' do
+        it 'redirects to home and logs the user in' do
           expect(response).to redirect_to(root_path)
-        end
 
-        it 'logs the user in' do
           expect(controller.current_user).to eq user
         end
       end
 
       context 'when using a valid password on a previously-used account with a new IP address' do
+        subject { post :create, params: { user: { email: user.email, password: user.password } } }
+
         let(:previous_ip) { '1.2.3.4' }
         let(:current_ip)  { '4.3.2.1' }
 
@@ -127,18 +121,17 @@
           Fabricate(:login_activity, user: user, ip: previous_ip)
           allow(controller.request).to receive(:remote_ip).and_return(current_ip)
           user.update(current_sign_in_at: 1.month.ago)
-          post :create, params: { user: { email: user.email, password: user.password } }
         end
 
-        it 'redirects to home' do
-          expect(response).to redirect_to(root_path)
-        end
+        it 'logs the user in and sends suspicious email and redirects home', :sidekiq_inline do
+          subject
 
-        it 'logs the user in' do
-          expect(controller.current_user).to eq user
-        end
+          expect(response)
+            .to redirect_to(root_path)
+
+          expect(controller.current_user)
+            .to eq user
 
-        it 'sends a suspicious sign-in mail', :sidekiq_inline do
           expect(UserMailer.deliveries.size).to eq(1)
           expect(UserMailer.deliveries.first.to.first).to eq(user.email)
           expect(UserMailer.deliveries.first.subject).to eq(I18n.t('user_mailer.suspicious_sign_in.subject'))
@@ -150,11 +143,9 @@
           post :create, params: { user: { email: user.email.upcase, password: user.password } }
         end
 
-        it 'redirects to home' do
+        it 'redirects to home and logs the user in' do
           expect(response).to redirect_to(root_path)
-        end
 
-        it 'logs the user in' do
           expect(controller.current_user).to eq user
         end
       end
@@ -164,11 +155,9 @@
           post :create, params: { user: { email: user.email, password: 'wrongpw' } }
         end
 
-        it 'shows a login error' do
+        it 'shows a login error and does not log the user in' do
           expect(flash[:alert]).to match I18n.t('devise.failure.invalid', authentication_keys: I18n.t('activerecord.attributes.user.email'))
-        end
 
-        it "doesn't log the user in" do
           expect(controller.current_user).to be_nil
         end
       end
@@ -270,7 +259,7 @@
             travel_to '2023-12-20T10:00:00Z'
           end
 
-          it 'does not log the user in' do
+          it 'does not log the user in, sets a flash message, and sends a suspicious sign in email', :sidekiq_inline do
             Auth::SessionsController::MAX_2FA_ATTEMPTS_PER_HOUR.times do
               post :create, params: { user: { otp_attempt: '1234' } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
               expect(controller.current_user).to be_nil
@@ -278,17 +267,10 @@
 
             post :create, params: { user: { otp_attempt: user.current_otp } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
 
-            expect(controller.current_user).to be_nil
-            expect(flash[:alert]).to match I18n.t('users.rate_limited')
-          end
-
-          it 'sends a suspicious sign-in mail', :sidekiq_inline do
-            Auth::SessionsController::MAX_2FA_ATTEMPTS_PER_HOUR.times do
-              post :create, params: { user: { otp_attempt: '1234' } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
-              expect(controller.current_user).to be_nil
-            end
-
-            post :create, params: { user: { otp_attempt: user.current_otp } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
+            expect(controller.current_user)
+              .to be_nil
+            expect(flash[:alert])
+              .to match I18n.t('users.rate_limited')
 
             expect(UserMailer.deliveries.size).to eq(1)
             expect(UserMailer.deliveries.first.to.first).to eq(user.email)
@@ -301,11 +283,9 @@
             post :create, params: { user: { otp_attempt: user.current_otp } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
           end
 
-          it 'redirects to home' do
+          it 'redirects to home and logs the user in' do
             expect(response).to redirect_to(root_path)
-          end
 
-          it 'logs the user in' do
             expect(controller.current_user).to eq user
           end
         end
@@ -318,11 +298,9 @@
             post :create, params: { user: { otp_attempt: user.current_otp } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
           end
 
-          it 'shows a login error' do
+          it 'shows a login error and does not log the user in' do
             expect(flash[:alert]).to match I18n.t('users.invalid_otp_token')
-          end
 
-          it "doesn't log the user in" do
             expect(controller.current_user).to be_nil
           end
         end
@@ -332,11 +310,9 @@
             post :create, params: { user: { otp_attempt: recovery_codes.first } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
           end
 
-          it 'redirects to home' do
+          it 'redirects to home and logs the user in' do
             expect(response).to redirect_to(root_path)
-          end
 
-          it 'logs the user in' do
             expect(controller.current_user).to eq user
           end
         end
@@ -346,11 +322,9 @@
             post :create, params: { user: { otp_attempt: 'wrongotp' } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
           end
 
-          it 'shows a login error' do
+          it 'shows a login error and does not log the user in' do
             expect(flash[:alert]).to match I18n.t('users.invalid_otp_token')
-          end
 
-          it "doesn't log the user in" do
             expect(controller.current_user).to be_nil
           end
         end
@@ -417,15 +391,11 @@
             post :create, params: { user: { credential: fake_credential } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
           end
 
-          it 'instructs the browser to redirect to home' do
+          it 'instructs the browser to redirect to home, logs the user in, and updates the sign count' do
             expect(body_as_json[:redirect_path]).to eq(root_path)
-          end
 
-          it 'logs the user in' do
             expect(controller.current_user).to eq user
-          end
 
-          it 'updates the sign count' do
             expect(webauthn_credential.reload.sign_count).to eq(sign_count)
           end
         end
diff --git a/spec/controllers/disputes/appeals_controller_spec.rb b/spec/controllers/disputes/appeals_controller_spec.rb
index da2f86ade5efeb..d763068ebe8c67 100644
--- a/spec/controllers/disputes/appeals_controller_spec.rb
+++ b/spec/controllers/disputes/appeals_controller_spec.rb
@@ -10,19 +10,17 @@
   let!(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
 
   describe '#create' do
+    subject { post :create, params: params }
+
     context 'with valid params' do
       let(:current_user) { Fabricate(:user) }
       let(:strike) { Fabricate(:account_warning, target_account: current_user.account) }
+      let(:params) { { strike_id: strike.id, appeal: { text: 'Foo' } } }
 
-      before do
-        post :create, params: { strike_id: strike.id, appeal: { text: 'Foo' } }
-      end
+      it 'notifies staff about new appeal and redirects back to strike page', :sidekiq_inline do
+        subject
 
-      it 'notifies staff about new appeal', :sidekiq_inline do
         expect(ActionMailer::Base.deliveries.first.to).to eq([admin.email])
-      end
-
-      it 'redirects back to the strike page' do
         expect(response).to redirect_to(disputes_strike_path(strike.id))
       end
     end
@@ -30,16 +28,12 @@
     context 'with invalid params' do
       let(:current_user) { Fabricate(:user) }
       let(:strike) { Fabricate(:account_warning, target_account: current_user.account) }
+      let(:params) { { strike_id: strike.id, appeal: { text: '' } } }
 
-      before do
-        post :create, params: { strike_id: strike.id, appeal: { text: '' } }
-      end
+      it 'does not send email and renders strike show page', :sidekiq_inline do
+        subject
 
-      it 'does not send email', :sidekiq_inline do
         expect(ActionMailer::Base.deliveries.size).to eq(0)
-      end
-
-      it 'renders the strike show page' do
         expect(response).to render_template('disputes/strikes/show')
       end
     end
diff --git a/spec/controllers/instance_actors_controller_spec.rb b/spec/controllers/instance_actors_controller_spec.rb
index 36b9049fbcf3c4..be1eefa7b22747 100644
--- a/spec/controllers/instance_actors_controller_spec.rb
+++ b/spec/controllers/instance_actors_controller_spec.rb
@@ -13,17 +13,19 @@
         end
 
         it 'returns http success with correct media type, headers, and session values' do
-          expect(response).to have_http_status(200)
+          expect(response)
+            .to have_http_status(200)
+            .and have_attributes(
+              media_type: eq('application/activity+json'),
+              cookies: be_empty
+            )
 
-          expect(response.media_type).to eq 'application/activity+json'
-
-          expect(response.cookies).to be_empty
-          expect(response.headers['Set-Cookies']).to be_nil
+          expect(response.headers)
+            .to include('Cache-Control' => include('public'))
+            .and not_include('Set-Cookies')
 
           expect(session).to be_empty
 
-          expect(response.headers['Cache-Control']).to include 'public'
-
           expect(body_as_json)
             .to include(:id, :type, :preferredUsername, :inbox, :publicKey, :inbox, :outbox, :url)
         end
diff --git a/spec/models/media_attachment_spec.rb b/spec/models/media_attachment_spec.rb
index 89916f9f500eee..1b9a13c38c2d62 100644
--- a/spec/models/media_attachment_spec.rb
+++ b/spec/models/media_attachment_spec.rb
@@ -91,20 +91,15 @@
     end
 
     it 'saves media attachment with correct file metadata' do
-      expect(media.persisted?).to be true
-      expect(media.file).to_not be_nil
-
-      # completes processing
-      expect(media.processing_complete?).to be true
-
-      # sets type
-      expect(media.type).to eq 'image'
-
-      # sets content type
-      expect(media.file_content_type).to eq content_type
-
-      # sets file extension
-      expect(media.file_file_name).to end_with extension
+      expect(media)
+        .to be_persisted
+        .and be_processing_complete
+        .and have_attributes(
+          file: be_present,
+          type: eq('image'),
+          file_content_type: eq(content_type),
+          file_file_name: end_with(extension)
+        )
 
       # Rack::Mime (used by PublicFileServerMiddleware) recognizes file extension
       expect(Rack::Mime.mime_type(extension, nil)).to eq content_type
@@ -112,17 +107,23 @@
 
     it 'saves media attachment with correct size metadata' do
       # strips original file name
-      expect(media.file_file_name).to_not start_with '600x400'
-
-      # sets meta for original
-      expect(media.file.meta['original']['width']).to eq 600
-      expect(media.file.meta['original']['height']).to eq 400
-      expect(media.file.meta['original']['aspect']).to eq 1.5
-
-      # sets meta for thumbnail
-      expect(media.file.meta['small']['width']).to eq 588
-      expect(media.file.meta['small']['height']).to eq 392
-      expect(media.file.meta['small']['aspect']).to eq 1.5
+      expect(media.file_file_name)
+        .to_not start_with '600x400'
+
+      # sets meta for original and thumbnail
+      expect(media.file.meta.deep_symbolize_keys)
+        .to include(
+          original: include(
+            width: eq(600),
+            height: eq(400),
+            aspect: eq(1.5)
+          ),
+          small: include(
+            width: eq(588),
+            height: eq(392),
+            aspect: eq(1.5)
+          )
+        )
     end
   end
 
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 6f25c89430c0e5..fb9b6a117bac27 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -483,35 +483,32 @@
   end
 
   describe '#mark_email_as_confirmed!' do
-    subject(:user) { Fabricate(:user, confirmed_at: confirmed_at) }
+    subject { user.mark_email_as_confirmed! }
 
-    before do
-      ActionMailer::Base.deliveries.clear
-      user.mark_email_as_confirmed!
-    end
+    let!(:user) { Fabricate(:user, confirmed_at: confirmed_at) }
+
+    before { ActionMailer::Base.deliveries.clear }
 
     after { ActionMailer::Base.deliveries.clear }
 
     context 'when user is new' do
       let(:confirmed_at) { nil }
 
-      it 'confirms user' do
-        expect(user.confirmed_at).to be_present
-      end
+      it 'confirms user and delivers welcome email', :sidekiq_inline do
+        subject
 
-      it 'delivers mails', :sidekiq_inline do
-        expect(ActionMailer::Base.deliveries.count).to eq 2
+        expect(user.confirmed_at).to be_present
+        expect(ActionMailer::Base.deliveries.count).to eq 1
       end
     end
 
     context 'when user is not new' do
       let(:confirmed_at) { Time.zone.now }
 
-      it 'confirms user' do
-        expect(user.confirmed_at).to be_present
-      end
+      it 'confirms user but does not deliver welcome email' do
+        subject
 
-      it 'does not deliver mail' do
+        expect(user.confirmed_at).to be_present
         expect(ActionMailer::Base.deliveries.count).to eq 0
       end
     end
diff --git a/spec/system/ocr_spec.rb b/spec/system/ocr_spec.rb
index 3ab815c047ae60..254efa71370aff 100644
--- a/spec/system/ocr_spec.rb
+++ b/spec/system/ocr_spec.rb
@@ -28,6 +28,6 @@
 
     click_on('Detect text from picture')
 
-    expect(page).to have_css('#upload-modal__description', text: 'Hello Mastodon')
+    expect(page).to have_css('#upload-modal__description', text: /Hello Mastodon\s*/, wait: 10)
   end
 end