From 71cfdd78650b85251b0253acd11e55227f72f506 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 13 Oct 2023 16:10:43 +0200
Subject: [PATCH] Fix duplicate tests (#27395)

---
 .../api/v1/reports_controller_spec.rb         | 63 -------------------
 spec/requests/api/v1/reports_spec.rb          | 45 +++++--------
 2 files changed, 14 insertions(+), 94 deletions(-)
 delete mode 100644 spec/controllers/api/v1/reports_controller_spec.rb

diff --git a/spec/controllers/api/v1/reports_controller_spec.rb b/spec/controllers/api/v1/reports_controller_spec.rb
deleted file mode 100644
index 624ceb213e..0000000000
--- a/spec/controllers/api/v1/reports_controller_spec.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Api::V1::ReportsController do
-  render_views
-
-  let(:user)  { Fabricate(:user) }
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
-
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
-  describe 'POST #create' do
-    let!(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
-
-    let(:scopes) { 'write:reports' }
-    let(:status) { Fabricate(:status) }
-    let(:target_account) { status.account }
-    let(:category) { nil }
-    let(:forward) { nil }
-    let(:rule_ids) { nil }
-
-    before do
-      post :create, params: { status_ids: [status.id], account_id: target_account.id, comment: 'reasons', category: category, rule_ids: rule_ids, forward: forward }
-    end
-
-    it 'creates a report', :aggregate_failures do
-      expect(response).to have_http_status(200)
-      expect(target_account.targeted_reports).to_not be_empty
-      expect(target_account.targeted_reports.first.comment).to eq 'reasons'
-      expect(ActionMailer::Base.deliveries.first.to).to eq([admin.email])
-    end
-
-    context 'when a status does not belong to the reported account' do
-      let(:target_account) { Fabricate(:account) }
-
-      it 'returns http not found' do
-        expect(response).to have_http_status(404)
-      end
-    end
-
-    context 'when a category is chosen' do
-      let(:category) { 'spam' }
-
-      it 'saves category' do
-        expect(target_account.targeted_reports.first.spam?).to be true
-      end
-    end
-
-    context 'when violated rules are chosen' do
-      let(:rule) { Fabricate(:rule) }
-      let(:category) { 'violation' }
-      let(:rule_ids) { [rule.id] }
-
-      it 'saves category and rule_ids' do
-        expect(target_account.targeted_reports.first.violation?).to be true
-        expect(target_account.targeted_reports.first.rule_ids).to contain_exactly(rule.id)
-      end
-    end
-  end
-end
diff --git a/spec/requests/api/v1/reports_spec.rb b/spec/requests/api/v1/reports_spec.rb
index ce74f17c48..ba3d2b3060 100644
--- a/spec/requests/api/v1/reports_spec.rb
+++ b/spec/requests/api/v1/reports_spec.rb
@@ -33,34 +33,22 @@ RSpec.describe 'Reports' do
 
     it_behaves_like 'forbidden for wrong scope', 'read read:reports'
 
-    it 'returns http success' do
-      subject
-
-      expect(response).to have_http_status(200)
-    end
-
-    it 'returns the created report' do
-      subject
-
-      expect(body_as_json).to match(
-        a_hash_including(
-          status_ids: [status.id.to_s],
-          category: category,
-          comment: 'reasons'
-        )
-      )
-    end
-
-    it 'creates a report' do
-      subject
-
-      expect(target_account.targeted_reports).to_not be_empty
-    end
-
-    it 'sends e-mails to admins' do
+    it 'creates a report', :aggregate_failures do
       perform_enqueued_jobs do
         subject
 
+        expect(response).to have_http_status(200)
+        expect(body_as_json).to match(
+          a_hash_including(
+            status_ids: [status.id.to_s],
+            category: category,
+            comment: 'reasons'
+          )
+        )
+
+        expect(target_account.targeted_reports).to_not be_empty
+        expect(target_account.targeted_reports.first.comment).to eq 'reasons'
+
         expect(ActionMailer::Base.deliveries.first.to).to eq([admin.email])
       end
     end
@@ -90,15 +78,10 @@ RSpec.describe 'Reports' do
       let(:category) { 'violation' }
       let(:rule_ids) { [rule.id] }
 
-      it 'saves category' do
+      it 'saves category and rule_ids' do
         subject
 
         expect(target_account.targeted_reports.first.violation?).to be true
-      end
-
-      it 'saves rule_ids' do
-        subject
-
         expect(target_account.targeted_reports.first.rule_ids).to contain_exactly(rule.id)
       end
     end