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

spec/requests/api/v1/media_spec.rb

@@ -193,4 +193,57 @@ RSpec.describe 'Media' do
       end
     end
   end
+
+  describe 'DELETE /api/v1/media/:id' do
+    subject do
+      delete "/api/v1/media/#{media.id}", headers: headers
+    end
+
+    context 'when media is not attached to a status' do
+      let(:media) { Fabricate(:media_attachment, account: user.account, status: nil) }
+
+      it 'returns http empty response' do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(response.content_type)
+          .to start_with('application/json')
+
+        expect(MediaAttachment.where(id: media.id)).to_not exist
+      end
+    end
+
+    context 'when media is attached to a status' do
+      let(:media) { Fabricate(:media_attachment, account: user.account, status: Fabricate.build(:status)) }
+
+      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).to match(
+          a_hash_including(
+            error: 'Media attachment is currently used by a status'
+          )
+        )
+
+        expect(MediaAttachment.where(id: media.id)).to exist
+      end
+    end
+
+    context 'when the media belongs to somebody else' do
+      let(:media) { Fabricate(:media_attachment, status: nil) }
+
+      it 'returns http not found' do
+        subject
+
+        expect(response).to have_http_status(404)
+        expect(response.content_type)
+          .to start_with('application/json')
+
+        expect(MediaAttachment.where(id: media.id)).to exist
+      end
+    end
+  end
 end

spec/requests/api/v1/statuses_spec.rb

@@ -346,13 +346,30 @@ RSpec.describe '/api/v1/statuses' do
 
       it_behaves_like 'forbidden for wrong scope', 'read read:statuses'
 
-      it 'removes the status', :aggregate_failures do
+      it 'discards the status and schedules removal as a redraft', :aggregate_failures do
         subject
 
         expect(response).to have_http_status(200)
         expect(response.content_type)
           .to start_with('application/json')
         expect(Status.find_by(id: status.id)).to be_nil
+        expect(RemovalWorker).to have_enqueued_sidekiq_job(status.id, { 'redraft' => true })
+      end
+
+      context 'when called with truthy delete_media' do
+        subject do
+          delete "/api/v1/statuses/#{status.id}?delete_media=true", headers: headers
+        end
+
+        it 'discards the status and schedules removal without the redraft flag', :aggregate_failures do
+          subject
+
+          expect(response).to have_http_status(200)
+          expect(response.content_type)
+            .to start_with('application/json')
+          expect(Status.find_by(id: status.id)).to be_nil
+          expect(RemovalWorker).to have_enqueued_sidekiq_job(status.id, { 'redraft' => false })
+        end
       end
     end