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

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

@@ -258,6 +258,19 @@ RSpec.describe 'Domain Blocks' do
           .to start_with('application/json')
       end
     end
+
+    context 'when severity is invalid' do
+      let(:params) { { domain: 'bar.com', severity: :bar } }
+
+      it 'returns http unprocessable entity' do
+        subject
+
+        expect(response).to have_http_status(422)
+        expect(response.content_type)
+          .to start_with('application/json')
+        expect(response.parsed_body[:error]).to eq('Validation failed: Severity is not included in the list')
+      end
+    end
   end
 
   describe 'PUT /api/v1/admin/domain_blocks/:id' do

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

@@ -187,6 +187,16 @@ RSpec.describe 'IP Blocks' do
           .to start_with('application/json')
       end
     end
+
+    context 'when the given severity is invalid' do
+      let(:params) { { ip: '151.0.32.55', severity: 'invalid' } }
+
+      it 'returns http unprocessable entity' do
+        subject
+
+        expect(response).to have_http_status(422)
+      end
+    end
   end
 
   describe 'PUT /api/v1/admin/ip_blocks/:id' do

spec/requests/api/v1/instances/languages_spec.rb

@@ -9,10 +9,21 @@ RSpec.describe 'Languages' do
     end
 
     it 'returns http success and includes supported languages' do
-      expect(response).to have_http_status(200)
+      expect(response)
+        .to have_http_status(200)
       expect(response.content_type)
         .to start_with('application/json')
-      expect(response.parsed_body.pluck(:code)).to match_array LanguagesHelper::SUPPORTED_LOCALES.keys.map(&:to_s)
+      expect(response.parsed_body)
+        .to match_array(supported_locale_expectations)
+    end
+
+    def supported_locale_expectations
+      LanguagesHelper::SUPPORTED_LOCALES.map do |key, values|
+        include(
+          code: key.to_s,
+          name: values.first
+        )
+      end
     end
   end
 end

spec/requests/api/v1/polls_spec.rb

@@ -36,6 +36,31 @@ RSpec.describe 'Polls' do
       end
     end
 
+    context 'when poll is remote and needs refresh' do
+      let(:poll) { Fabricate(:poll, last_fetched_at: nil, account: remote_account, status: status) }
+      let(:remote_account) { Fabricate :account, domain: 'host.example' }
+      let(:service) { instance_double(ActivityPub::FetchRemotePollService, call: nil) }
+      let(:status) { Fabricate(:status, visibility: 'public', account: remote_account) }
+
+      before { allow(ActivityPub::FetchRemotePollService).to receive(:new).and_return(service) }
+
+      it 'returns poll data and calls fetch remote service' do
+        subject
+
+        expect(response)
+          .to have_http_status(200)
+        expect(response.content_type)
+          .to start_with('application/json')
+        expect(response.parsed_body).to match(
+          a_hash_including(
+            id: poll.id.to_s
+          )
+        )
+        expect(service)
+          .to have_received(:call).with(poll, user.account)
+      end
+    end
+
     context 'when parent status is private' do
       let(:visibility) { 'private' }