Merge branch 'fix_intialize_last_keyword_cop' into 'master'

[RUN AS-IF-FOSS] Fix intialize last keyword cop, and autocorrect more occurrences

See merge request gitlab-org/gitlab!48423

ee/spec/factories/ci/reports/security/finding_keys.rb

@@ -12,7 +12,7 @@ FactoryBot.define do
     skip_create
 
     initialize_with do
-      ::Gitlab::Ci::Reports::Security::FindingKey.new(attributes)
+      ::Gitlab::Ci::Reports::Security::FindingKey.new(**attributes)
     end
   end
 end

ee/spec/finders/custom_project_templates_finder_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe CustomProjectTemplatesFinder do
   let(:base_params) { { current_user: user } }
   let(:params) { {} }
 
-  subject { described_class.new(base_params.merge(params)) }
+  subject { described_class.new(**base_params.merge(params)) }
 
   it 'returns an empty relation if group is not set' do
     expect(subject.execute).to be_empty

ee/spec/lib/gitlab/analytics/type_of_work/tasks_by_type_spec.rb

@@ -23,7 +23,7 @@ RSpec.describe Gitlab::Analytics::TypeOfWork::TasksByType do
   end
 
   subject do
-    described_class.new(params).counts_by_labels
+    described_class.new(**params).counts_by_labels
   end
 
   around do |example|
@@ -121,7 +121,7 @@ RSpec.describe Gitlab::Analytics::TypeOfWork::TasksByType do
   end
 
   shared_examples '#top_labels' do
-    let(:top_labels) { described_class.new(params).top_labels }
+    let(:top_labels) { described_class.new(**params).top_labels }
 
     let!(:with_label) do
       create(factory_name, {
@@ -144,7 +144,7 @@ RSpec.describe Gitlab::Analytics::TypeOfWork::TasksByType do
     end
 
     it 'limits the the size of the results' do
-      expect(described_class.new(params).top_labels(1)).to eq([other_label])
+      expect(described_class.new(**params).top_labels(1)).to eq([other_label])
     end
   end
 

rubocop/cop/lint/last_keyword_argument.rb

@@ -47,6 +47,8 @@ module RuboCop
         def known_match?(file_path, line_number, method_name)
           file_path_from_root = file_path.sub(File.expand_path('../../..', __dir__), '')
 
+          method_name = 'initialize' if method_name == 'new'
+
           self.class.keyword_warnings.any? do |warning|
             warning.include?("#{file_path_from_root}:#{line_number}") && warning.include?("called method `#{method_name}'")
           end

spec/lib/gitlab/ci/ansi2json/result_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe Gitlab::Ci::Ansi2json::Result do
     { lines: [], state: state, append: false, truncated: false, offset: offset, stream: stream }
   end
 
-  subject { described_class.new(params) }
+  subject { described_class.new(**params) }
 
   describe '#size' do
     before do

spec/lib/gitlab/ci/ansi2json/style_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 RSpec.describe Gitlab::Ci::Ansi2json::Style do
   describe '#set?' do
-    subject { described_class.new(params).set? }
+    subject { described_class.new(**params).set? }
 
     context 'when fg color is set' do
       let(:params) { { fg: 'term-fg-black' } }
@@ -44,7 +44,7 @@ RSpec.describe Gitlab::Ci::Ansi2json::Style do
   end
 
   describe 'update formats to mimic terminals' do
-    subject { described_class.new(params) }
+    subject { described_class.new(**params) }
 
     context 'when fg color present' do
       let(:params) { { fg: 'term-fg-black', mask: mask } }

spec/lib/gitlab/ci/build/artifacts/metadata_spec.rb

@@ -142,7 +142,7 @@ RSpec.describe Gitlab::Ci::Build::Artifacts::Metadata do
       it 'reads expected number of entries' do
         stream = File.open(tmpfile.path)
 
-        metadata = described_class.new(stream, 'public', { recursive: true })
+        metadata = described_class.new(stream, 'public', recursive: true)
 
         expect(metadata.find_entries!.count).to eq entry_count
       end

spec/lib/gitlab/ci/config/entry/image_spec.rb

@@ -81,7 +81,7 @@ RSpec.describe Gitlab::Ci::Config::Entry::Image do
     context 'when configuration has ports' do
       let(:ports) { [{ number: 80, protocol: 'http', name: 'foobar' }] }
       let(:config) { { name: 'ruby:2.7', entrypoint: %w(/bin/sh run), ports: ports } }
-      let(:entry) { described_class.new(config, { with_image_ports: image_ports }) }
+      let(:entry) { described_class.new(config, with_image_ports: image_ports) }
       let(:image_ports) { false }
 
       context 'when with_image_ports metadata is not enabled' do

spec/lib/gitlab/ci/config/entry/service_spec.rb

@@ -96,7 +96,7 @@ RSpec.describe Gitlab::Ci::Config::Entry::Service do
         { name: 'postgresql:9.5', alias: 'db', command: %w(cmd run), entrypoint: %w(/bin/sh run), ports: ports }
       end
 
-      let(:entry) { described_class.new(config, { with_image_ports: image_ports }) }
+      let(:entry) { described_class.new(config, with_image_ports: image_ports) }
       let(:image_ports) { false }
 
       context 'when with_image_ports metadata is not enabled' do

spec/lib/gitlab/ci/config/entry/services_spec.rb

@@ -38,7 +38,7 @@ RSpec.describe Gitlab::Ci::Config::Entry::Services do
   context 'when configuration has ports' do
     let(:ports) { [{ number: 80, protocol: 'http', name: 'foobar' }] }
     let(:config) { ['postgresql:9.5', { name: 'postgresql:9.1', alias: 'postgres_old', ports: ports }] }
-    let(:entry) { described_class.new(config, { with_image_ports: image_ports }) }
+    let(:entry) { described_class.new(config, with_image_ports: image_ports) }
     let(:image_ports) { false }
 
     context 'when with_image_ports metadata is not enabled' do

spec/lib/gitlab/cycle_analytics/stage_summary_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe Gitlab::CycleAnalytics::StageSummary do
     project.add_maintainer(user)
   end
 
-  let(:stage_summary) { described_class.new(project, options).data }
+  let(:stage_summary) { described_class.new(project, **options).data }
 
   describe "#new_issues" do
     subject { stage_summary.first }
@@ -121,7 +121,7 @@ RSpec.describe Gitlab::CycleAnalytics::StageSummary do
       end
 
       it 'does not include commit stats' do
-        data = described_class.new(project, options).data
+        data = described_class.new(project, **options).data
         expect(includes_commits?(data)).to be_falsy
       end
 

spec/lib/gitlab/email/reply_parser_spec.rb

@@ -6,7 +6,7 @@ require "spec_helper"
 RSpec.describe Gitlab::Email::ReplyParser do
   describe '#execute' do
     def test_parse_body(mail_string, params = {})
-      described_class.new(Mail::Message.new(mail_string), params).execute
+      described_class.new(Mail::Message.new(mail_string), **params).execute
     end
 
     it "returns an empty string if the message is blank" do

spec/lib/gitlab/graphql/pagination/externally_paginated_array_connection_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe Gitlab::Graphql::Pagination::ExternallyPaginatedArrayConnection d
   let(:arguments) { {} }
 
   subject(:connection) do
-    described_class.new(all_nodes, { max_page_size: values.size }.merge(arguments))
+    described_class.new(all_nodes, **{ max_page_size: values.size }.merge(arguments))
   end
 
   it_behaves_like 'a connection with collection methods'

spec/lib/gitlab/graphql/pagination/keyset/connection_spec.rb

@@ -10,11 +10,11 @@ RSpec.describe Gitlab::Graphql::Pagination::Keyset::Connection do
   let(:context) { GraphQL::Query::Context.new(query: OpenStruct.new(schema: schema), values: nil, object: nil) }
 
   subject(:connection) do
-    described_class.new(nodes, { context: context, max_page_size: 3 }.merge(arguments))
+    described_class.new(nodes, **{ context: context, max_page_size: 3 }.merge(arguments))
   end
 
   def encoded_cursor(node)
-    described_class.new(nodes, { context: context }).cursor_for(node)
+    described_class.new(nodes, context: context).cursor_for(node)
   end
 
   def decoded_cursor(cursor)

spec/rubocop/cop/lint/last_keyword_argument_spec.rb

@@ -45,6 +45,9 @@ RSpec.describe RuboCop::Cop::Lint::LastKeywordArgument, type: :rubocop do
       <<~YAML
       ---
       test_api/projects_get_/projects_when_unauthenticated_behaves_like_projects_response_returns_an_array_of_projects:
+      - |
+        DEPRECATION WARNING: /Users/tkuah/code/ee-gdk/gitlab/projects_spec.rb:1: warning: Using the last argument as keyword parameters is deprecated; maybe ** should be added to the call
+        /Users/tkuah/code/ee-gdk/gitlab/lib/gitlab/project.rb:15: warning: The called method `initialize' is defined here
       - |
         DEPRECATION WARNING: /Users/tkuah/.rbenv/versions/2.7.2/lib/ruby/gems/2.7.0/gems/state_machines-activerecord-0.6.0/lib/state_machines/integrations/active_record.rb:511: warning: Using the last argument as keyword parameters is deprecated; maybe ** should be added to the call
         /Users/tkuah/.rbenv/versions/2.7.2/lib/ruby/gems/2.7.0/gems/activerecord-6.0.3.3/lib/active_record/suppressor.rb:43: warning: The called method `save' is defined here
@@ -70,6 +73,17 @@ RSpec.describe RuboCop::Cop::Lint::LastKeywordArgument, type: :rubocop do
       SOURCE
     end
 
+    it 'registers an offense for the new method call' do
+      expect_offense(<<~SOURCE, 'projects_spec.rb')
+        Project.new(params)
+                    ^^^^^^ Using the last argument as keyword parameters is deprecated
+      SOURCE
+
+      expect_correction(<<~SOURCE)
+        Project.new(**params)
+      SOURCE
+    end
+
     it 'registers an offense and corrects by converting hash to kwarg' do
       expect_offense(<<~SOURCE, 'create_service.rb')
         users.call(id, { a: :b, c: :d })

spec/services/ci/create_job_artifacts_service_spec.rb

@@ -24,7 +24,7 @@ RSpec.describe Ci::CreateJobArtifactsService do
     upload = Tempfile.new('upload')
     FileUtils.copy(path, upload.path)
 
-    UploadedFile.new(upload.path, params)
+    UploadedFile.new(upload.path, **params)
   end
 
   describe '#execute' do

spec/support/caching.rb

@@ -25,7 +25,7 @@ RSpec.configure do |config|
     original_null_store = Rails.cache
     caching_config_hash = Gitlab::Redis::Cache.params
     caching_config_hash[:namespace] = Gitlab::Redis::Cache::CACHE_NAMESPACE
-    Rails.cache = ActiveSupport::Cache::RedisCacheStore.new(caching_config_hash)
+    Rails.cache = ActiveSupport::Cache::RedisCacheStore.new(**caching_config_hash)
 
     redis_cache_cleanup!
 

spec/support/helpers/gitlab_verify_helpers.rb

@@ -2,7 +2,7 @@
 
 module GitlabVerifyHelpers
   def collect_ranges(args = {})
-    verifier = described_class.new(args.merge(batch_size: 1))
+    verifier = described_class.new(**args.merge(batch_size: 1))
 
     collect_results(verifier).map { |range, _| range }
   end