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

spec/services/activitypub/process_status_update_service_spec.rb

@@ -277,7 +277,7 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do
           .to change { status.tags.reload.pluck(:name) }.from(%w(test foo)).to(%w(foo bar))
           .and change { status.account.featured_tags.find_by(name: 'test').statuses_count }.by(-1)
           .and change { status.account.featured_tags.find_by(name: 'bar').statuses_count }.by(1)
-          .and change { status.account.featured_tags.find_by(name: 'bar').last_status_at }.from(nil).to(be_within(0.1).of(Time.now.utc))
+          .and change { status.account.featured_tags.find_by(name: 'bar').last_status_at }.from(nil).to(be_present)
       end
     end
 

spec/services/appeal_service_spec.rb

@@ -4,7 +4,7 @@ require 'rails_helper'
 
 RSpec.describe AppealService, :inline_jobs do
   describe '#call' do
-    let!(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
+    let!(:admin) { Fabricate(:admin_user) }
 
     context 'with an existing strike' do
       let(:strike) { Fabricate(:account_warning) }

spec/services/software_update_check_service_spec.rb

@@ -9,7 +9,7 @@ RSpec.describe SoftwareUpdateCheckService do
     let(:full_update_check_url) { "#{update_check_url}?version=#{Mastodon::Version.kmyblue_major}.#{Mastodon::Version.kmyblue_minor}-lts#{Mastodon::Version.dev? ? '-dev' : ''}" }
 
     let(:devops_role)     { Fabricate(:user_role, name: 'DevOps', permissions: UserRole::FLAGS[:view_devops]) }
-    let(:owner_user)      { Fabricate(:user, role: UserRole.find_by(name: 'Owner')) }
+    let(:owner_user)      { Fabricate(:owner_user) }
     let(:old_devops_user) { Fabricate(:user) }
     let(:none_user)       { Fabricate(:user, role: devops_role) }
     let(:patch_user)      { Fabricate(:user, role: devops_role) }