From 8c240ef0428f8977142dc98697e8c238189f4702 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Mon, 10 Feb 2025 02:33:36 -0500 Subject: [PATCH] Remove final remaining `assigns` usage in controller specs (#33866) --- .../admin/accounts_controller_spec.rb | 11 +++++------ .../admin/instances_controller_spec.rb | 18 +++--------------- spec/requests/admin/instances_spec.rb | 18 ++++++++++++++++++ 3 files changed, 26 insertions(+), 21 deletions(-) create mode 100644 spec/requests/admin/instances_spec.rb diff --git a/spec/controllers/admin/accounts_controller_spec.rb b/spec/controllers/admin/accounts_controller_spec.rb index 72ca2275cf..2ec3bca746 100644 --- a/spec/controllers/admin/accounts_controller_spec.rb +++ b/spec/controllers/admin/accounts_controller_spec.rb @@ -59,16 +59,15 @@ RSpec.describe Admin::AccountsController do let(:account) { Fabricate(:account) } it 'includes moderation notes' do - note1 = Fabricate(:account_moderation_note, target_account: account) - note2 = Fabricate(:account_moderation_note, target_account: account) + note1 = Fabricate(:account_moderation_note, target_account: account, content: 'Note 1 remarks') + note2 = Fabricate(:account_moderation_note, target_account: account, content: 'Note 2 remarks') get :show, params: { id: account.id } expect(response).to have_http_status(200) - moderation_notes = assigns(:moderation_notes).to_a - - expect(moderation_notes.size).to be 2 - expect(moderation_notes).to eq [note1, note2] + expect(response.body) + .to include(note1.content) + .and include(note2.content) end end diff --git a/spec/controllers/admin/instances_controller_spec.rb b/spec/controllers/admin/instances_controller_spec.rb index 83655bafa0..b6508eb38b 100644 --- a/spec/controllers/admin/instances_controller_spec.rb +++ b/spec/controllers/admin/instances_controller_spec.rb @@ -49,23 +49,11 @@ RSpec.describe Admin::InstancesController do expect(response).to have_http_status(200) - instance = assigns(:instance) - expect(instance).to_not be_new_record + expect(response.body) + .to include(I18n.t('admin.instances.totals_time_period_hint_html')) + .and include(I18n.t('accounts.nothing_here')) expect(Admin::ActionLogFilter).to have_received(:new).with(target_domain: account_popular_main.domain) - - action_logs = assigns(:action_logs).to_a - expect(action_logs.size).to eq 0 - end - - context 'with an unknown domain' do - it 'returns http success' do - get :show, params: { id: 'unknown.example' } - expect(response).to have_http_status(200) - - instance = assigns(:instance) - expect(instance).to be_new_record - end end end diff --git a/spec/requests/admin/instances_spec.rb b/spec/requests/admin/instances_spec.rb new file mode 100644 index 0000000000..afb6602a22 --- /dev/null +++ b/spec/requests/admin/instances_spec.rb @@ -0,0 +1,18 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe 'Admin Instances' do + describe 'GET /admin/instances/:id' do + context 'with an unknown domain' do + before { sign_in Fabricate(:admin_user) } + + it 'returns http success' do + get admin_instance_path(id: 'unknown.example') + + expect(response) + .to have_http_status(200) + end + end + end +end