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

spec/models/form/admin_settings_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Form::AdminSettings do
+RSpec.describe Form::AdminSettings do
   describe 'validations' do
     describe 'site_contact_username' do
       context 'with no accounts' do

spec/models/form/custom_emoji_batch_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Form::CustomEmojiBatch do
+RSpec.describe Form::CustomEmojiBatch do
   describe '#save' do
     subject { described_class.new({ current_account: account }.merge(options)) }
 

spec/models/form/status_filter_batch_action_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Form::StatusFilterBatchAction do
+RSpec.describe Form::StatusFilterBatchAction do
   describe '#save!' do
     it 'does nothing if status_filter_ids is empty' do
       batch_action = described_class.new(status_filter_ids: [])