From f64a639bcfa1fc2bc89ca7db268f594306edfd7c Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 16 Mar 2021 18:18:33 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-10-stable-ee --- .../has_spam_action_response_fields_spec.rb | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 spec/spam/concerns/has_spam_action_response_fields_spec.rb (limited to 'spec/spam') diff --git a/spec/spam/concerns/has_spam_action_response_fields_spec.rb b/spec/spam/concerns/has_spam_action_response_fields_spec.rb new file mode 100644 index 00000000000..4d5f8d9d431 --- /dev/null +++ b/spec/spam/concerns/has_spam_action_response_fields_spec.rb @@ -0,0 +1,35 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe Spam::Concerns::HasSpamActionResponseFields do + subject do + klazz = Class.new + klazz.include described_class + klazz.new + end + + describe '#with_spam_action_response_fields' do + let(:spam_log) { double(:spam_log, id: 1) } + let(:spammable) { double(:spammable, spam?: true, render_recaptcha?: true, spam_log: spam_log) } + let(:recaptcha_site_key) { 'abc123' } + + before do + allow(Gitlab::CurrentSettings).to receive(:recaptcha_site_key) { recaptcha_site_key } + end + + it 'merges in spam action fields from spammable' do + result = subject.send(:with_spam_action_response_fields, spammable) do + { other_field: true } + end + expect(result) + .to eq({ + spam: true, + needs_captcha_response: true, + spam_log_id: 1, + captcha_site_key: recaptcha_site_key, + other_field: true + }) + end + end +end -- cgit v1.2.1