From b76ae638462ab0f673e5915986070518dd3f9ad3 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 19 Aug 2021 09:08:42 +0000
Subject: Add latest changes from gitlab-org/gitlab@14-2-stable-ee

---
 .../spam/akismet_mark_as_spam_service_spec.rb      | 52 ++++++++++++++++++++++
 spec/services/spam/mark_as_spam_service_spec.rb    | 52 ----------------------
 spec/services/spam/spam_action_service_spec.rb     |  3 +-
 3 files changed, 54 insertions(+), 53 deletions(-)
 create mode 100644 spec/services/spam/akismet_mark_as_spam_service_spec.rb
 delete mode 100644 spec/services/spam/mark_as_spam_service_spec.rb

(limited to 'spec/services/spam')

diff --git a/spec/services/spam/akismet_mark_as_spam_service_spec.rb b/spec/services/spam/akismet_mark_as_spam_service_spec.rb
new file mode 100644
index 00000000000..12666e23e47
--- /dev/null
+++ b/spec/services/spam/akismet_mark_as_spam_service_spec.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Spam::AkismetMarkAsSpamService do
+  let(:user_agent_detail) { build(:user_agent_detail) }
+  let(:spammable) { build(:issue, user_agent_detail: user_agent_detail) }
+  let(:fake_akismet_service) { double(:akismet_service, submit_spam: true) }
+
+  subject { described_class.new(target: spammable) }
+
+  describe '#execute' do
+    before do
+      allow(subject).to receive(:akismet).and_return(fake_akismet_service)
+    end
+
+    context 'when the spammable object is not submittable' do
+      before do
+        allow(spammable).to receive(:submittable_as_spam?).and_return false
+      end
+
+      it 'does not submit as spam' do
+        expect(subject.execute).to be_falsey
+      end
+    end
+
+    context 'spam is submitted successfully' do
+      before do
+        allow(spammable).to receive(:submittable_as_spam?).and_return true
+        allow(fake_akismet_service).to receive(:submit_spam).and_return true
+      end
+
+      it 'submits as spam' do
+        expect(subject.execute).to be_truthy
+      end
+
+      it "updates the spammable object's user agent detail as being submitted as spam" do
+        expect(user_agent_detail).to receive(:update_attribute)
+
+        subject.execute
+      end
+
+      context 'when Akismet does not consider it spam' do
+        it 'does not update the spammable object as spam' do
+          allow(fake_akismet_service).to receive(:submit_spam).and_return false
+
+          expect(subject.execute).to be_falsey
+        end
+      end
+    end
+  end
+end
diff --git a/spec/services/spam/mark_as_spam_service_spec.rb b/spec/services/spam/mark_as_spam_service_spec.rb
deleted file mode 100644
index 308a66c3a48..00000000000
--- a/spec/services/spam/mark_as_spam_service_spec.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe Spam::MarkAsSpamService do
-  let(:user_agent_detail) { build(:user_agent_detail) }
-  let(:spammable) { build(:issue, user_agent_detail: user_agent_detail) }
-  let(:fake_akismet_service) { double(:akismet_service, submit_spam: true) }
-
-  subject { described_class.new(target: spammable) }
-
-  describe '#execute' do
-    before do
-      allow(subject).to receive(:akismet).and_return(fake_akismet_service)
-    end
-
-    context 'when the spammable object is not submittable' do
-      before do
-        allow(spammable).to receive(:submittable_as_spam?).and_return false
-      end
-
-      it 'does not submit as spam' do
-        expect(subject.execute).to be_falsey
-      end
-    end
-
-    context 'spam is submitted successfully' do
-      before do
-        allow(spammable).to receive(:submittable_as_spam?).and_return true
-        allow(fake_akismet_service).to receive(:submit_spam).and_return true
-      end
-
-      it 'submits as spam' do
-        expect(subject.execute).to be_truthy
-      end
-
-      it "updates the spammable object's user agent detail as being submitted as spam" do
-        expect(user_agent_detail).to receive(:update_attribute)
-
-        subject.execute
-      end
-
-      context 'when Akismet does not consider it spam' do
-        it 'does not update the spammable object as spam' do
-          allow(fake_akismet_service).to receive(:submit_spam).and_return false
-
-          expect(subject.execute).to be_falsey
-        end
-      end
-    end
-  end
-end
diff --git a/spec/services/spam/spam_action_service_spec.rb b/spec/services/spam/spam_action_service_spec.rb
index 3a92e5acb5a..8ddfa7ed3a0 100644
--- a/spec/services/spam/spam_action_service_spec.rb
+++ b/spec/services/spam/spam_action_service_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 RSpec.describe Spam::SpamActionService do
   include_context 'includes Spam constants'
 
-  let(:issue) { create(:issue, project: project, author: user) }
+  let(:issue) { create(:issue, project: project, author: author) }
   let(:fake_ip) { '1.2.3.4' }
   let(:fake_user_agent) { 'fake-user-agent' }
   let(:fake_referer) { 'fake-http-referer' }
@@ -23,6 +23,7 @@ RSpec.describe Spam::SpamActionService do
 
   let_it_be(:project) { create(:project, :public) }
   let_it_be(:user) { create(:user) }
+  let_it_be(:author) { create(:user) }
 
   before do
     issue.spam = false
-- 
cgit v1.2.3