Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42

1 files changed, 18 insertions, 10 deletions

diff --git a/spec/controllers/snippets/notes_controller_spec.rb b/spec/controllers/snippets/notes_controller_spec.rb
index 558e68fbb8f..8e85e283b31 100644
--- a/spec/controllers/snippets/notes_controller_spec.rb
+++ b/spec/controllers/snippets/notes_controller_spec.rb
@@ -142,9 +142,12 @@ RSpec.describe Snippets::NotesController do
         expect { post :create, params: request_params }.to change { Note.count }.by(1)
       end
 
-      it_behaves_like 'request exceeding rate limit', :clean_gitlab_redis_cache do
-        let(:params) { request_params }
-        let(:request_full_path) { snippet_notes_path(public_snippet) }
+      it_behaves_like 'create notes request exceeding rate limit', :clean_gitlab_redis_cache do
+        let(:current_user) { user }
+
+        def request
+          post :create, params: request_params
+        end
       end
     end
 
@@ -170,9 +173,12 @@ RSpec.describe Snippets::NotesController do
         expect { post :create, params: request_params }.to change { Note.count }.by(1)
       end
 
-      it_behaves_like 'request exceeding rate limit', :clean_gitlab_redis_cache do
-        let(:params) { request_params }
-        let(:request_full_path) { snippet_notes_path(internal_snippet) }
+      it_behaves_like 'create notes request exceeding rate limit', :clean_gitlab_redis_cache do
+        let(:current_user) { user }
+
+        def request
+          post :create, params: request_params
+        end
       end
     end
 
@@ -239,10 +245,12 @@ RSpec.describe Snippets::NotesController do
           expect { post :create, params: request_params }.to change { Note.count }.by(1)
         end
 
-        it_behaves_like 'request exceeding rate limit', :clean_gitlab_redis_cache do
-          let(:params) { request_params }
-          let(:request_full_path) { snippet_notes_path(private_snippet) }
-          let(:user) { private_snippet.author }
+        it_behaves_like 'create notes request exceeding rate limit', :clean_gitlab_redis_cache do
+          let(:current_user) { private_snippet.author }
+
+          def request
+            post :create, params: request_params
+          end
         end
       end
     end