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

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Terms of Service' do
+  describe 'GET /api/v1/instance/terms_of_service' do
+    before do
+      Fabricate(:terms_of_service)
+    end
+
+    it 'returns http success' do
+      get api_v1_instance_terms_of_service_path
+
+      expect(response)
+        .to have_http_status(200)
+      expect(response.content_type)
+        .to start_with('application/json')
+
+      expect(response.parsed_body)
+        .to be_present
+        .and include(:content)
+    end
+  end
+end

spec/requests/api/v1/media_spec.rb

@@ -137,7 +137,7 @@ RSpec.describe 'Media' do
     end
 
     context 'with image/gif', :attachment_processing do
-      let(:params) { { file: fixture_file_upload('attachment.gif', 'image/gif') } }
+      let(:params) { { file: fixture_file_upload('600x400.gif', 'image/gif') } }
 
       it_behaves_like 'a successful media upload', 'image'
     end