Add latest changes from gitlab-org/gitlab@master

2 files changed, 29 insertions, 0 deletions

diff --git a/spec/models/hooks/web_hook_log_spec.rb b/spec/models/hooks/web_hook_log_spec.rb
index 3520720d9a4..128601794cf 100644
--- a/spec/models/hooks/web_hook_log_spec.rb
+++ b/spec/models/hooks/web_hook_log_spec.rb
@@ -69,4 +69,20 @@ describe WebHookLog do
       it { expect(web_hook_log.success?).to be_falsey }
     end
   end
+
+  describe '#internal_error?' do
+    let(:web_hook_log) { build_stubbed(:web_hook_log, response_status: status) }
+
+    context 'when response status is not an internal error' do
+      let(:status) { '200' }
+
+      it { expect(web_hook_log.internal_error?).to be_falsey }
+    end
+
+    context 'when response status is an internal error' do
+      let(:status) { 'internal error' }
+
+      it { expect(web_hook_log.internal_error?).to be_truthy }
+    end
+  end
 end
diff --git a/spec/requests/api/project_import_spec.rb b/spec/requests/api/project_import_spec.rb
index 186f0f52a46..71dd8fee0ae 100644
--- a/spec/requests/api/project_import_spec.rb
+++ b/spec/requests/api/project_import_spec.rb
@@ -196,6 +196,19 @@ describe API::ProjectImport do
       end
     end
 
+    context 'when request exceeds the rate limit' do
+      before do
+        allow(::Gitlab::ApplicationRateLimiter).to receive(:throttled?).and_return(true)
+      end
+
+      it 'prevents users from importing projects' do
+        post api('/projects/import', user), params: { path: 'test-import', file: fixture_file_upload(file), namespace: namespace.id }
+
+        expect(response).to have_gitlab_http_status(429)
+        expect(json_response['message']['error']).to eq('This endpoint has been requested too many times. Try again later.')
+      end
+    end
+
     def stub_import(namespace)
       expect_any_instance_of(ProjectImportState).to receive(:schedule)
       expect(::Projects::CreateService).to receive(:new).with(user, hash_including(namespace_id: namespace.id)).and_call_original