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

spec/controllers/admin/instances_controller_spec.rb

@@ -12,6 +12,8 @@ RSpec.describe Admin::InstancesController do
   before do
     _account_less_popular = Fabricate(:account, domain: 'less.popular')
     _account_popular_other = Fabricate(:account, domain: 'popular')
+    Instance.refresh
+
     sign_in current_user, scope: :user
   end
 

spec/controllers/disputes/appeals_controller_spec.rb

@@ -10,19 +10,38 @@ RSpec.describe Disputes::AppealsController do
   let!(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
 
   describe '#create' do
-    let(:current_user) { Fabricate(:user) }
-    let(:strike) { Fabricate(:account_warning, target_account: current_user.account) }
+    context 'with valid params' do
+      let(:current_user) { Fabricate(:user) }
+      let(:strike) { Fabricate(:account_warning, target_account: current_user.account) }
 
-    before do
-      post :create, 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', :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
 
-    it 'notifies staff about new appeal', :sidekiq_inline do
-      expect(ActionMailer::Base.deliveries.first.to).to eq([admin.email])
-    end
+    context 'with invalid params' do
+      let(:current_user) { Fabricate(:user) }
+      let(:strike) { Fabricate(:account_warning, target_account: current_user.account) }
 
-    it 'redirects back to the strike page' do
-      expect(response).to redirect_to(disputes_strike_path(strike.id))
+      before do
+        post :create, params: { strike_id: strike.id, appeal: { text: '' } }
+      end
+
+      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
   end
 end