Code review comments appliedfj-48123-fix-gitlab-import

2 files changed, 9 insertions, 13 deletions

diff --git a/lib/gitlab/gitlab_import/client.rb b/lib/gitlab/gitlab_import/client.rb
index e24b96bc799..38ef12491df 100644
--- a/lib/gitlab/gitlab_import/client.rb
+++ b/lib/gitlab/gitlab_import/client.rb
@@ -33,13 +33,13 @@ module Gitlab
       end
 
       def issues(project_identifier, **kwargs)
-        lazy_page_iterator(**pagination_params(kwargs)) do |page, per_page|
+        lazy_page_iterator(**kwargs) do |page, per_page|
           api.get("/api/v4/projects/#{project_identifier}/issues?per_page=#{per_page}&page=#{page}").parsed
         end
       end
 
       def issue_comments(project_identifier, issue_id, **kwargs)
-        lazy_page_iterator(**pagination_params(kwargs)) do |page, per_page|
+        lazy_page_iterator(**kwargs) do |page, per_page|
           api.get("/api/v4/projects/#{project_identifier}/issues/#{issue_id}/notes?per_page=#{per_page}&page=#{page}").parsed
         end
       end
@@ -49,7 +49,7 @@ module Gitlab
       end
 
       def projects(**kwargs)
-        lazy_page_iterator(**pagination_params(kwargs)) do |page, per_page|
+        lazy_page_iterator(**kwargs) do |page, per_page|
           api.get("/api/v4/projects?per_page=#{per_page}&page=#{page}&simple=true&membership=true").parsed
         end
       end
@@ -82,10 +82,6 @@ module Gitlab
       def gitlab_options
         OmniAuth::Strategies::GitLab.default_options[:client_options].to_h.symbolize_keys
       end
-
-      def pagination_params(kwargs)
-        kwargs.slice(:starting_page, :page_limit, :per_page)
-      end
     end
   end
 end
diff --git a/spec/lib/gitlab/gitlab_import/client_spec.rb b/spec/lib/gitlab/gitlab_import/client_spec.rb
index bda5c9cb454..22ad88e28cb 100644
--- a/spec/lib/gitlab/gitlab_import/client_spec.rb
+++ b/spec/lib/gitlab/gitlab_import/client_spec.rb
@@ -34,24 +34,24 @@ describe Gitlab::GitlabImport::Client do
 
       expect(client).to receive(:lazy_page_iterator).with(hash_including(page_limit: 2)).and_call_original
 
-      method.call(*args.push(page_limit: 2, per_page: 1)).to_a
+      client.send(method, *args, page_limit: 2, per_page: 1).to_a
     end
 
     it 'allows per_page param' do
       expect(client).to receive(:lazy_page_iterator).with(hash_including(per_page: 2)).and_call_original
 
-      method.call(*args.push(per_page: 2)).to_a
+      client.send(method, *args, per_page: 2).to_a
     end
 
     it 'allows starting_page param' do
       expect(client).to receive(:lazy_page_iterator).with(hash_including(starting_page: 3)).and_call_original
 
-      method.call(*args.push(starting_page: 3)).to_a
+      client.send(method, *args, starting_page: 3).to_a
     end
   end
 
   describe '#projects' do
-    subject(:method) { client.method(:projects) }
+    subject(:method) { :projects }
     let(:args) { [] }
     let(:element_list) { build_list(:project, 2) }
 
@@ -66,7 +66,7 @@ describe Gitlab::GitlabImport::Client do
   end
 
   describe '#issues' do
-    subject(:method) { client.method(:issues) }
+    subject(:method) { :issues }
     let(:args) { [1] }
     let(:element_list) { build_list(:issue, 2) }
 
@@ -81,7 +81,7 @@ describe Gitlab::GitlabImport::Client do
   end
 
   describe '#issue_comments' do
-    subject(:method) { client.method(:issue_comments) }
+    subject(:method) { :issue_comments }
     let(:args) { [1, 1] }
     let(:element_list) { build_list(:note_on_issue, 2) }