Add latest changes from gitlab-org/gitlab@13-1-stable-ee

1 files changed, 3 insertions, 3 deletions

diff --git a/spec/features/snippets/spam_snippets_spec.rb b/spec/features/snippets/spam_snippets_spec.rb
index d7b181dc678..e6a9467a3d7 100644
--- a/spec/features/snippets/spam_snippets_spec.rb
+++ b/spec/features/snippets/spam_snippets_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-shared_examples_for 'snippet editor' do
+RSpec.shared_examples_for 'snippet editor' do
   include_context 'includes Spam constants'
 
   def description_field
@@ -68,7 +68,7 @@ shared_examples_for 'snippet editor' do
   context 'when SpamVerdictService requires recaptcha' do
     before do
       expect_next_instance_of(Spam::SpamVerdictService) do |verdict_service|
-        expect(verdict_service).to receive(:execute).and_return(REQUIRE_RECAPTCHA)
+        expect(verdict_service).to receive(:execute).and_return(CONDITIONAL_ALLOW)
       end
     end
 
@@ -122,7 +122,7 @@ shared_examples_for 'snippet editor' do
   end
 end
 
-describe 'User creates snippet', :js do
+RSpec.describe 'User creates snippet', :js do
   let_it_be(:user) { create(:user) }
 
   it_behaves_like "snippet editor"