Merge remote-tracking branch 'glitch/main'

1 files changed, 12 insertions, 10 deletions

diff --git a/spec/controllers/settings/migrations_controller_spec.rb b/spec/controllers/settings/migrations_controller_spec.rb
index 35c5747a0..9b12bc40f 100644
--- a/spec/controllers/settings/migrations_controller_spec.rb
+++ b/spec/controllers/settings/migrations_controller_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 describe Settings::MigrationsController do
@@ -5,7 +7,7 @@ describe Settings::MigrationsController do
 
   shared_examples 'authenticate user' do
     it 'redirects to sign_in page' do
-      is_expected.to redirect_to new_user_session_path
+      expect(subject).to redirect_to new_user_session_path
     end
   end
 
@@ -27,8 +29,8 @@ describe Settings::MigrationsController do
         let(:moved_to_account) { nil }
 
         it 'renders show page' do
-          is_expected.to have_http_status 200
-          is_expected.to render_template :show
+          expect(subject).to have_http_status 200
+          expect(subject).to render_template :show
         end
       end
 
@@ -36,8 +38,8 @@ describe Settings::MigrationsController do
         let(:moved_to_account) { Fabricate(:account) }
 
         it 'renders show page' do
-          is_expected.to have_http_status 200
-          is_expected.to render_template :show
+          expect(subject).to have_http_status 200
+          expect(subject).to render_template :show
         end
       end
     end
@@ -61,7 +63,7 @@ describe Settings::MigrationsController do
         let(:acct) { Fabricate(:account, also_known_as: [ActivityPub::TagManager.instance.uri_for(user.account)]) }
 
         it 'updates moved to account' do
-          is_expected.to redirect_to settings_migration_path
+          expect(subject).to redirect_to settings_migration_path
           expect(user.account.reload.moved_to_account_id).to eq acct.id
         end
       end
@@ -70,7 +72,7 @@ describe Settings::MigrationsController do
         let(:acct) { user.account }
 
         it 'renders show' do
-          is_expected.to render_template :show
+          expect(subject).to render_template :show
         end
 
         it 'does not update the moved account' do
@@ -82,7 +84,7 @@ describe Settings::MigrationsController do
         let(:acct) { Fabricate(:account, also_known_as: []) }
 
         it 'renders show' do
-          is_expected.to render_template :show
+          expect(subject).to render_template :show
         end
 
         it 'does not update the moved account' do
@@ -90,7 +92,7 @@ describe Settings::MigrationsController do
         end
       end
 
-      context 'when a recent migration already exists ' do
+      context 'when a recent migration already exists' do
         let(:acct) { Fabricate(:account, also_known_as: [ActivityPub::TagManager.instance.uri_for(user.account)]) }
 
         before do
@@ -99,7 +101,7 @@ describe Settings::MigrationsController do
         end
 
         it 'renders show' do
-          is_expected.to render_template :show
+          expect(subject).to render_template :show
         end
 
         it 'does not update the moved account' do