From 6438df3a1e0fb944485cebf07976160184697d72 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Wed, 20 Jan 2021 13:34:23 -0600
Subject: Add latest changes from gitlab-org/gitlab@13-8-stable-ee

---
 .../import/bulk_imports_controller_spec.rb         | 36 +++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

(limited to 'spec/controllers/import')

diff --git a/spec/controllers/import/bulk_imports_controller_spec.rb b/spec/controllers/import/bulk_imports_controller_spec.rb
index 436daed0af6..d1c138617bb 100644
--- a/spec/controllers/import/bulk_imports_controller_spec.rb
+++ b/spec/controllers/import/bulk_imports_controller_spec.rb
@@ -63,9 +63,16 @@ RSpec.describe Import::BulkImportsController do
             )
           end
 
+          let(:client_params) do
+            {
+              top_level_only: true,
+              min_access_level: Gitlab::Access::MAINTAINER
+            }
+          end
+
           before do
             allow(controller).to receive(:client).and_return(client)
-            allow(client).to receive(:get).with('groups', top_level_only: true).and_return(client_response)
+            allow(client).to receive(:get).with('groups', client_params).and_return(client_response)
           end
 
           it 'returns serialized group data' do
@@ -73,6 +80,17 @@ RSpec.describe Import::BulkImportsController do
 
             expect(json_response).to eq({ importable_data: client_response.parsed_response }.as_json)
           end
+
+          context 'when filtering' do
+            it 'returns filtered result' do
+              filter = 'test'
+              search_params = client_params.merge(search: filter)
+
+              expect(client).to receive(:get).with('groups', search_params).and_return(client_response)
+
+              get :status, format: :json, params: { filter: filter }
+            end
+          end
         end
 
         context 'when host url is local or not http' do
@@ -131,6 +149,22 @@ RSpec.describe Import::BulkImportsController do
         end
       end
 
+      describe 'GET realtime_changes' do
+        let_it_be(:bulk_import) { create(:bulk_import, :created, user: user) }
+
+        it 'returns bulk imports created by current user' do
+          get :realtime_changes
+
+          expect(json_response).to eq([{ 'id' => bulk_import.id, 'status_name' => bulk_import.status_name.to_s }])
+        end
+
+        it 'sets a Poll-Interval header' do
+          get :realtime_changes
+
+          expect(response.headers['Poll-Interval']).to eq(Import::BulkImportsController::POLLING_INTERVAL.to_s)
+        end
+      end
+
       describe 'POST create' do
         let(:instance_url) { "http://fake-intance" }
         let(:pat) { "fake-pat" }
-- 
cgit v1.2.3