Merge commit '2954279e9c630a9d146575bf600978dc6c5279bd' into glitch-soc/merge-upstream

spec/requests/api/v1/admin/ip_blocks_spec.rb

@@ -177,7 +177,9 @@ RSpec.describe 'IP Blocks' do
     let(:params)    { { severity: 'sign_up_requires_approval', comment: 'Decreasing severity' } }
 
     it 'returns the correct ip block', :aggregate_failures do
-      subject
+      expect { subject }
+        .to change_severity_level
+        .and change_comment_value
 
       expect(response).to have_http_status(200)
       expect(body_as_json).to match(hash_including({
@@ -187,12 +189,12 @@ RSpec.describe 'IP Blocks' do
       }))
     end
 
-    it 'updates the severity correctly' do
-      expect { subject }.to change { ip_block.reload.severity }.from('no_access').to('sign_up_requires_approval')
+    def change_severity_level
+      change { ip_block.reload.severity }.from('no_access').to('sign_up_requires_approval')
     end
 
-    it 'updates the comment correctly' do
-      expect { subject }.to change { ip_block.reload.comment }.from('Spam').to('Decreasing severity')
+    def change_comment_value
+      change { ip_block.reload.comment }.from('Spam').to('Decreasing severity')
     end
 
     context 'when ip block does not exist' do

spec/requests/api/v1/admin/trends/links/links_spec.rb

@@ -32,18 +32,18 @@ describe 'Links' do
     it_behaves_like 'forbidden for wrong role', ''
 
     it 'returns http success' do
-      subject
+      expect { subject }
+        .to change_link_trendable_to_true
 
       expect(response).to have_http_status(200)
+      expects_correct_link_data
     end
 
-    it 'sets the link as trendable' do
-      expect { subject }.to change { preview_card.reload.trendable }.from(false).to(true)
+    def change_link_trendable_to_true
+      change { preview_card.reload.trendable }.from(false).to(true)
     end
 
-    it 'returns the link data' do
-      subject
-
+    def expects_correct_link_data
       expect(body_as_json).to match(
         a_hash_including(
           url: preview_card.url,
@@ -85,13 +85,14 @@ describe 'Links' do
     it_behaves_like 'forbidden for wrong role', ''
 
     it 'returns http success' do
-      subject
+      expect { subject }
+        .to_not change_link_trendable
 
       expect(response).to have_http_status(200)
     end
 
-    it 'does not set the link as trendable' do
-      expect { subject }.to_not(change { preview_card.reload.trendable })
+    def change_link_trendable
+      change { preview_card.reload.trendable }
     end
 
     it 'returns the link data' do