gitlab-styles 10.0.0 → 10.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be58fa1f46b81e0e8a73c3c85843048680518c23e846bcf54a1df301c53cfa18
-  data.tar.gz: 95f2466fb2ae6f5dcfcfce8b7e9343101588b9627f0c9c061c53beac597126e9
+  metadata.gz: 0cd204f5572b14a03cd4f6faec35d9973f07dcab0579cf17ebb5fc10d56ac6b0
+  data.tar.gz: 7a126190155bc1b39eea832c88e4636306f0fafb09f4b6c2c12c9fb275032a8c
 SHA512:
-  metadata.gz: cb13dbe44128173fc03b4dddf53cfdfb67a6e8d37ffc6f4c32a4e30c33ead6e686b6023c2cff9fe7fbf95600d518b508fb9b9b68ffbb07dc8686765f65f3f638
-  data.tar.gz: 6a2774df245a7c42725e8989a8683b4953d91f70f059c0ceb41450b1c305b375f4e150ecb9418a56f60833ce166eca335ce94ba3a03fb7cf29575c7b72cbd54f
+  metadata.gz: ef80fd1223c28800de324bb2e71bc1c4e381137ddf7e4a4605e7d1e6e301cca3fc5cee69146a80fe23213a77c8c459d7037e305372242702d4cc8c9bb2b08c0b
+  data.tar.gz: 4f60365ef4232d584eb8ec18f99f8ac5537bd4bf933777d5125c4fb2f71423e7c487dd61f18e9e4e40738c4d02949d9291d7fda7a66fa88442bcdeb8854621c0

data/.gitignore

@@ -1,7 +1,7 @@
+/_yardoc/
 /.bundle/
+/.byebug_history
 /.yardoc
-/Gemfile.lock
-/_yardoc/
 /coverage/
 /pkg/
 /spec/reports/
@@ -11,4 +11,4 @@
 .rspec_status
 
 # Ignore IDE specific files
-.idea/
+.idea/

data/.gitlab/merge_request_templates/Release.md

@@ -1,13 +1,26 @@
-<!-- Replace `<PREVIOUS_VERSION>` with the previous version number here, `<COMMIT_UPDATING_VERSION>` with the latest
+<!-- Replace `<PREVIOUS_VERSION>` with the previous version number, `<COMMIT_UPDATING_VERSION>` with the latest
 commit from this merge request, and `<NEW_VERSION>` with the upcoming version number. -->
 ## Diff
 
-https://gitlab.com/gitlab-org/ruby/gems/gitlab-styles/compare/v<PREVIOUS_VERSION>...<COMMIT_UPDATING_VERSION>
+https://gitlab.com/gitlab-org/ruby/gems/gitlab-styles/-/compare/v<PREVIOUS_VERSION>...<COMMIT_UPDATING_VERSION>
 
 ## Checklist
 
-- [ ] Diff link is up-to-date.
-- [ ] Check the release notes: https://gitlab.com/api/v4/projects/4176070/repository/changelog?version=<NEW_VERSION>
-- [ ] Based on the diff and the release notes, `version.rb` is updated, according to [SemVer](https://semver.org).
+- [ ] Change the `VERSION` constant to a minor version in  `lib/gitlab/styles/version.rb` (you might have to change the version number in the next steps according to [SemVer](https://semver.org)).
+- [ ] Ensure the diff link above is up-to-date.
+- [ ] Add release notes to the [Changelog](#changelog) section below.
+- [ ] Based on the diff and the release notes, update the `version.rb` according to [SemVer](https://semver.org).
+- [ ] Create an MR on `gitlab-org/gitlab` project [with the `New Version of gitlab-styles.md` template](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/merge_request_templates/New%20Version%20of%20gitlab-styles.md) to test the new version of `gitlab-styles`, and follow the MR instructions.
+
+## Changelog
+
+<!--
+Paste output of:
+
+curl https://gitlab.com/api/v4/projects/4176070/repository/changelog?version=<NEW_VERSION> | jq -r ".notes"
+
+NOTE: Skip `v` in `<NEW_VERSION>`. For example, Use `version=10.0.0` instead of `version=v10.0.0`.
+
+-->
 
 /label ~"type::maintenance" ~"static code analysis"

data/.gitlab-ci.yml

@@ -10,6 +10,9 @@ default:
     - bundle --version
     - bundle install
 
+variables:
+  BUNDLE_FROZEN: 'true'
+
 workflow:
   rules:
     # For merge requests, create a pipeline.

data/.rubocop.yml

@@ -1,6 +1,6 @@
 inherit_from:
-  - .rubocop_todo.yml
   - rubocop-default.yml
+  - .rubocop_todo.yml
 
 require:
   - rubocop/cop/internal_affairs
@@ -9,6 +9,10 @@ require:
 AllCops:
   NewCops: disable # https://gitlab.com/gitlab-org/ruby/gems/gitlab-styles/-/issues/40
 
+Gemspec/DevelopmentDependencies:
+  EnforcedStyle: gemspec
+  Enabled: true
+
 InternalAffairs/DeprecateCopHelper:
   Enabled: true
   Include:

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-01-11 12:59:00 UTC using RuboCop version 1.43.0.
+# on 2023-06-05 10:15:47 UTC using RuboCop version 1.50.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -10,3 +10,27 @@
 InternalAffairs/InheritDeprecatedCopClass:
   Exclude:
     - 'lib/rubocop/cop/gitlab_security/json_serialization.rb'
+
+# Offense count: 11
+InternalAffairs/MissingCopDepartment:
+  Exclude:
+    - 'lib/rubocop/cop/active_record_dependent.rb'
+    - 'lib/rubocop/cop/active_record_serialize.rb'
+    - 'lib/rubocop/cop/avoid_return_from_blocks.rb'
+    - 'lib/rubocop/cop/custom_error_class.rb'
+    - 'lib/rubocop/cop/gem_fetcher.rb'
+    - 'lib/rubocop/cop/in_batches.rb'
+    - 'lib/rubocop/cop/line_break_after_guard_clauses.rb'
+    - 'lib/rubocop/cop/line_break_around_conditional_block.rb'
+    - 'lib/rubocop/cop/polymorphic_associations.rb'
+    - 'lib/rubocop/cop/redirect_with_status.rb'
+    - 'lib/rubocop/cop/without_reactive_cache.rb'
+
+# Offense count: 5
+InternalAffairs/UseRestrictOnSend:
+  Exclude:
+    - 'lib/rubocop/cop/active_record_dependent.rb'
+    - 'lib/rubocop/cop/active_record_serialize.rb'
+    - 'lib/rubocop/cop/in_batches.rb'
+    - 'lib/rubocop/cop/polymorphic_associations.rb'
+    - 'lib/rubocop/cop/without_reactive_cache.rb'

data/Gemfile

@@ -4,19 +4,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in gitlab-rubocop.gemspec
 gemspec
-
-group :development do
-  gem 'lefthook', require: false
-  gem 'test_file_finder', '~> 0.1.4'
-end
-
-group :test do
-  # Pin these dependencies, otherwise a new rule could break the CI pipelines
-  gem 'rubocop', '1.43.0'
-  gem 'rubocop-rspec', '2.18.1'
-  gem 'rspec-parameterized-table_syntax', '1.0.0', require: false
-
-  gem 'simplecov', '~> 0.22.0', require: false
-  gem 'simplecov-html', '~> 0.12.3', require: false
-  gem 'simplecov-cobertura', '~> 2.1.0', require: false
-end

data/Gemfile.lock

@@ -0,0 +1,227 @@
+PATH
+  remote: .
+  specs:
+    gitlab-styles (10.1.0)
+      rubocop (~> 1.50.2)
+      rubocop-graphql (~> 0.18)
+      rubocop-performance (~> 1.15)
+      rubocop-rails (~> 2.17)
+      rubocop-rspec (~> 2.22)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (7.0.4.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    addressable (2.8.4)
+      public_suffix (>= 2.0.2, < 6.0)
+    ast (2.4.2)
+    binding_of_caller (1.0.0)
+      debug_inspector (>= 0.0.1)
+    byebug (11.1.3)
+    claide (1.1.0)
+    claide-plugins (0.9.2)
+      cork
+      nap
+      open4 (~> 1.3)
+    coderay (1.1.3)
+    colored2 (3.1.2)
+    concurrent-ruby (1.2.2)
+    cork (0.3.0)
+      colored2 (~> 3.1)
+    danger (9.3.0)
+      claide (~> 1.0)
+      claide-plugins (>= 0.9.2)
+      colored2 (~> 3.1)
+      cork (~> 0.1)
+      faraday (>= 0.9.0, < 3.0)
+      faraday-http-cache (~> 2.0)
+      git (~> 1.13.0)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.0)
+      no_proxy_fix
+      octokit (~> 5.0)
+      terminal-table (>= 1, < 4)
+    danger-gitlab (8.0.0)
+      danger
+      gitlab (~> 4.2, >= 4.2.0)
+    debug_inspector (1.1.0)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    faraday (1.10.3)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-http-cache (2.5.0)
+      faraday (>= 0.8)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    git (1.13.2)
+      addressable (~> 2.8)
+      rchardet (~> 1.8)
+    gitlab (4.19.0)
+      httparty (~> 0.20)
+      terminal-table (>= 1.5.1)
+    gitlab-dangerfiles (3.6.7)
+      danger (>= 8.4.5)
+      danger-gitlab (>= 8.0.0)
+      rake
+    httparty (0.21.0)
+      mini_mime (>= 1.0.0)
+      multi_xml (>= 0.5.2)
+    i18n (1.13.0)
+      concurrent-ruby (~> 1.0)
+    json (2.6.3)
+    kramdown (2.4.0)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    lefthook (1.3.13)
+    method_source (1.0.0)
+    mini_mime (1.1.2)
+    minitest (5.18.0)
+    multi_xml (0.6.0)
+    multipart-post (2.3.0)
+    nap (1.1.0)
+    no_proxy_fix (0.1.2)
+    octokit (5.6.1)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
+    open4 (1.3.4)
+    parallel (1.23.0)
+    parser (3.2.2.1)
+      ast (~> 2.4.1)
+    proc_to_ast (0.1.0)
+      coderay
+      parser
+      unparser
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.10.1)
+      byebug (~> 11.0)
+      pry (>= 0.13, < 0.15)
+    public_suffix (5.0.1)
+    rack (3.0.7)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    rchardet (1.8.0)
+    regexp_parser (2.8.0)
+    rexml (3.2.5)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-parameterized-core (1.0.0)
+      parser
+      proc_to_ast
+      rspec (>= 2.13, < 4)
+      unparser
+    rspec-parameterized-table_syntax (1.0.0)
+      binding_of_caller
+      rspec-parameterized-core (< 2)
+    rspec-support (3.12.0)
+    rubocop (1.50.2)
+      json (~> 2.3)
+      parallel (~> 1.10)
+      parser (>= 3.2.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.28.1)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.18.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.23.0)
+      rubocop (~> 1.33)
+    rubocop-graphql (0.19.0)
+      rubocop (>= 0.87, < 2)
+    rubocop-performance (1.17.1)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rails (2.19.1)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 1.33.0, < 2.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.22.0)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
+    sawyer (0.9.2)
+      addressable (>= 2.3.5)
+      faraday (>= 0.17.3, < 3)
+    simplecov (0.22.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-cobertura (2.1.0)
+      rexml
+      simplecov (~> 0.19)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    test_file_finder (0.1.4)
+      faraday (~> 1.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.4.2)
+    unparser (0.6.7)
+      diff-lcs (~> 1.3)
+      parser (>= 3.2.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 2.1)
+  gitlab-dangerfiles (~> 3.6.7)
+  gitlab-styles!
+  lefthook (~> 1.3.13)
+  pry-byebug (~> 3.10)
+  rake (~> 13.0)
+  rspec (~> 3.0)
+  rspec-parameterized-table_syntax (~> 1.0.0)
+  rubocop-rake (~> 0.6)
+  simplecov (~> 0.22.0)
+  simplecov-cobertura (~> 2.1.0)
+  simplecov-html (~> 0.12.3)
+  test_file_finder (~> 0.1.4)
+
+BUNDLED WITH
+   2.4.13

data/README.md

@@ -91,7 +91,6 @@ To release a new version:
 1. Create a Merge Request.
 1. Use Merge Request template [Release.md](https://gitlab.com/gitlab-org/ruby/gems/gitlab-styles/-/blob/master/.gitlab/merge_request_templates/Release.md).
 1. Follow the instructions.
-1. (Optional, but appreciated) Create an MR on `gitlab-org/gitlab` project [with the `New Version of gitlab-styles.md` template](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/merge_request_templates/New%20Version%20of%20gitlab-styles.md) to test the new version of `gitlab-styles`, and follow the MR instructions.
 1. After the Merge Request has been merged, a new gem version is [published automatically](https://gitlab.com/gitlab-org/quality/pipeline-common/-/blob/master/ci/gem-release.yml)
 
 See [!123](https://gitlab.com/gitlab-org/ruby/gems/gitlab-styles/-/merge_requests/123) as an example.

data/gitlab-styles.gemspec

@@ -22,15 +22,22 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'rubocop', '~> 1.43.0'
+  spec.add_dependency 'rubocop', '~> 1.50.2'
   spec.add_dependency 'rubocop-graphql', '~> 0.18'
   spec.add_dependency 'rubocop-performance', '~> 1.15'
   spec.add_dependency 'rubocop-rails', '~> 2.17'
-  spec.add_dependency 'rubocop-rspec', '~> 2.18'
+  spec.add_dependency 'rubocop-rspec', '~> 2.22'
 
   spec.add_development_dependency 'bundler', '~> 2.1'
-  spec.add_development_dependency 'gitlab-dangerfiles', '~> 2.11.0'
+  spec.add_development_dependency 'gitlab-dangerfiles', '~> 3.6.7'
+  spec.add_development_dependency 'lefthook', '~> 1.3.13'
+  spec.add_development_dependency 'pry-byebug', '~> 3.10'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rspec-parameterized-table_syntax', '~> 1.0.0'
   spec.add_development_dependency 'rubocop-rake', '~> 0.6'
+  spec.add_development_dependency 'simplecov', '~> 0.22.0'
+  spec.add_development_dependency 'simplecov-cobertura', '~> 2.1.0'
+  spec.add_development_dependency 'simplecov-html', '~> 0.12.3'
+  spec.add_development_dependency 'test_file_finder', '~> 0.1.4'
 end

data/lib/gitlab/styles/rubocop/migration_helpers.rb

@@ -7,7 +7,7 @@ module Gitlab
       module MigrationHelpers
         # Returns true if the given node originated from the db/migrate directory.
         def in_migration?(node)
-          dirname = File.dirname(node.location.expression.source_buffer.name)
+          dirname = File.dirname(node.source_range.source_buffer.name)
 
           dirname.end_with?(
             'db/migrate',

data/lib/gitlab/styles/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module Styles
-    VERSION = '10.0.0'
+    VERSION = '10.1.0'
   end
 end

data/lib/rubocop/cop/custom_error_class.rb

@@ -36,7 +36,7 @@ module Rubocop
 
           replacement = "#{class_name_from_node(klass)} = Class.new(#{class_name_from_node(parent)})"
 
-          corrector.replace(node.source_range, replacement)
+          corrector.replace(node, replacement)
         end
       end
 

data/lib/rubocop/cop/internal_affairs/missing_cop_department.rb

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module InternalAffairs
+      # Enforces the use of explicit department names for cop rules.
+      #
+      # @example
+      #   # bad
+      #   module RuboCop
+      #     module Cop
+      #       class Implicit
+      #       end
+      #     end
+      #   end
+      #
+      #   module RuboCop
+      #     module Cop
+      #       module Cop
+      #         class Explicit
+      #         end
+      #       end
+      #     end
+      #   end
+      #
+      #   # good
+      #   module RuboCop
+      #     module Cop
+      #       module Foo
+      #         class Implicit
+      #         end
+      #       end
+      #     end
+      #   end
+      #
+      #   module RuboCop
+      #     module Cop
+      #       module Foo
+      #         class Explicit
+      #         end
+      #       end
+      #     end
+      #   end
+      class MissingCopDepartment < Base
+        MSG = 'Define a proper department. Using `Cop/` as department is discourged.'
+
+        COP_DEPARTMENT = 'Cop'
+
+        def on_class(node)
+          namespace = full_namespace(node)
+
+          # Skip top-level RuboCop::Cop
+          names = namespace.drop(2)
+
+          add_offense(node.loc.name) if names.size < 2 || names.first == COP_DEPARTMENT
+        end
+
+        private
+
+        def full_namespace(node)
+          (node_namespace(node) + parents_namespace(node)).reverse
+        end
+
+        def node_namespace(node)
+          name_parts(node).reverse
+        end
+
+        def parents_namespace(node)
+          node
+            .each_ancestor(:module, :class)
+            .flat_map { |node| name_parts(node) }
+        end
+
+        def name_parts(node)
+          node.identifier.source.split('::')
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/internal_affairs/use_restrict_on_send.rb

@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module InternalAffairs
+      # Flags if `RESTRICT_ON_SEND` constant not defined and method name is
+      # checked programmatically in `on_send` methods.
+      #
+      # @example
+      #   # bad
+      #   def on_send(node)
+      #     return unless method_name(node) == :foo
+      #     return unless node.children[1] == :foo
+      #     return unless METHOD_NAMES.include?(method_name(node))
+      #
+      #     name = node.children[1]
+      #     return unless name == :foo
+      #     name2 = method_name(node)
+      #     return unless name == :foo
+      #
+      #     # more code
+      #   end
+      #
+      #   # good
+      #   RESTRICT_ON_SEND = %i[foo].freeze
+      #
+      #   def on_send(node)
+      #     # more code
+      #   end
+      #
+      #   # ignored - not `on_send`
+      #   def on_def(node)
+      #     return unless method_name(node) == :foo
+      #   end
+      #
+      #   # ignored - `else` branch
+      #   def on_send(node)
+      #     if method_name(node) == :foo
+      #       add_offense(node)
+      #     else
+      #       something_else
+      #     end
+      #   end
+      class UseRestrictOnSend < Base
+        MSG = 'Define constant `RESTRICT_ON_SEND` to speed up calls to `on_send`. ' \
+              'The following line is then no longer necessary:'
+
+        # @!method method_name_plain(node)
+        def_node_matcher :method_name_plain, <<~PATTERN
+          {
+            (send _ :method_name _ ...)       # method_name(node)
+            (send
+              (send _ :children) :[] (int 1)  # node.children[1]
+            )
+          }
+        PATTERN
+
+        # @!method method_name_call(node)
+        def_node_matcher :method_name_call, <<~PATTERN
+          {
+            #method_name_plain
+            (lvar %1)
+          }
+        PATTERN
+
+        # @!method method_name_assignment(node)
+        def_node_search :method_name_assignment, <<~PATTERN
+          (lvasgn $_name #method_name_plain)
+        PATTERN
+
+        # @!method method_name_check(node)
+        def_node_search :method_name_check, <<~PATTERN
+          (if
+            ${
+              (send #method_name_call(%1) {:== :!=} _) # method_name(node) == foo
+              (send _ :include? #method_name_call(%1)) # a.include?(method_name(node))
+            }
+            {!nil? nil? | nil? !nil?}                  # has either `if` or `else` branch - not both
+          )
+        PATTERN
+
+        def on_def(node)
+          return unless node.method?(:on_send)
+          return if @restrict_on_send_set
+
+          local_assignments = method_name_assignment(node).to_set
+
+          method_name_check(node, local_assignments) do |call_node|
+            add_offense(call_node)
+          end
+        end
+
+        def on_casgn(node)
+          @restrict_on_send_set = true if node.name == :RESTRICT_ON_SEND
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/line_break_after_guard_clauses.rb

@@ -71,7 +71,7 @@ module Rubocop
         return if next_line(node).blank? || clause_last_line?(next_line(node)) || guard_clause?(next_sibling(node))
 
         add_offense(node) do |corrector|
-          corrector.insert_after(node.loc.expression, "\n")
+          corrector.insert_after(node, "\n")
         end
       end
 

data/lib/rubocop/cop/line_break_around_conditional_block.rb

@@ -125,7 +125,7 @@ module Rubocop
       end
 
       def in_haml?(node)
-        node.location.expression.source_buffer.name.end_with?('.haml.rb')
+        node.source_range.source_buffer.name.end_with?('.haml.rb')
       end
     end
   end

data/lib/rubocop/cop/rspec/empty_line_after_shared_example.rb

@@ -44,8 +44,15 @@ module Rubocop
         MSG = 'Add an empty line after `%<example>s` block.'
 
         # @!method shared_examples(node)
-        def_node_matcher :shared_examples,
-          block_pattern('{#SharedGroups.all #Includes.all}')
+        def_node_matcher :shared_examples, <<~PATTERN
+          {
+            (block (send #rspec? #SharedGroups.all ...) ...)
+            {
+              (block (send nil? #Includes.all ...) ...)
+              (send nil? #Includes.all ...)
+            }
+          }
+        PATTERN
 
         def on_block(node)
           shared_examples(node) do

data/lib/rubocop/cop/rspec/example_starting_character.rb

@@ -77,7 +77,7 @@ module Rubocop
         end
 
         def docstring(node)
-          expr = node.loc.expression
+          expr = node.source_range
 
           Parser::Source::Range.new(
             expr.source_buffer,

data/lib/rubocop/cop/rspec/factory_bot/excessive_create_list.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'rubocop-rspec'
+require_relative '../base'
+
+module Rubocop
+  module Cop
+    module RSpec
+      module FactoryBot
+        # Check for create_list FactoryBot declarations higher than configured MaxAmount.
+        #
+        # @example MaxAmount: 20
+        #   We do not allow more than 20 items to be created.
+        #
+        #   # bad
+        #   create_list(:merge_request, 1000, state: :opened)
+        #
+        #   # good
+        #   create_list(:merge_request, 15, state: :opened)
+        #
+        # @example
+        #   We do not allow more than 10 items to be created (default)
+        #   # bad
+        #   create_list(:merge_request, 1000, state: :opened)
+        #
+        #   # good
+        #   create_list(:merge_request, 10, state: :opened)
+        #
+        class ExcessiveCreateList < Base
+          MESSAGE = 'Avoid using `create_list` with more than %{max_amount} items.'
+
+          # @!method create_list?(node)
+          def_node_matcher :create_list?, <<~PATTERN
+            (send nil? :create_list (sym ...) $(int _) ...)
+          PATTERN
+
+          RESTRICT_ON_SEND = %i[create_list].freeze
+
+          def on_send(node)
+            number_node = create_list?(node)
+            return unless number_node
+
+            max_amount = cop_config['MaxAmount']
+            return if number_node.value <= max_amount
+
+            add_offense(number_node, message: format(MESSAGE, max_amount: max_amount))
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/rspec/useless_dynamic_definition.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require_relative 'base'
+
+module Rubocop
+  module Cop
+    module RSpec
+      # Flags useless dynamic hook/let definitions via `.each`, `.each_key`, or
+      # `.each_value` without defining a wrapping `context` explicitly inside
+      # the loop block. Without it, the let definition will always/only be set
+      # to the final value.
+      #
+      # @example
+      #
+      #   # bad
+      #   context 'foo' do
+      #     [true, false].each do |bool|
+      #       before do
+      #         stub_something(bool: bool)
+      #       end
+      #
+      #       let(:foo) { build(:model, bool: bool) }
+      #
+      #       it 'works' do
+      #         # `bool` is always `false`
+      #       end
+      #     end
+      #   end
+      #
+      #   # good
+      #   context 'foo' do
+      #     [true, false].each do |bool|
+      #       context "with bool #{bool}" do # <--
+      #         before do
+      #           stub_something(bool: bool)
+      #         end
+      #
+      #         let(:foo) { build(:model, bool: bool) }
+      #
+      #         it 'works' do
+      #           # `bool` is `true` and then `false`
+      #         end
+      #       end
+      #     end
+      #   end
+      class UselessDynamicDefinition < Base
+        MSG = 'Avoid useless dynamic definitions without `context`.'
+
+        RESTRICT_ON_SEND = %i[each each_key each_value].freeze
+
+        def on_send(node)
+          return unless dynamic_definition?(node.parent)
+
+          add_offense(node.loc.selector)
+        end
+
+        private
+
+        def dynamic_definition?(node)
+          group = RuboCop::RSpec::ExampleGroup.new(node)
+
+          group.lets.any? || group.hooks.any?
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/rspec/verbose_include_metadata.rb

@@ -42,7 +42,7 @@ module Rubocop
           invalid_metadata_matches(node) do |match|
             add_offense(node, message: format(MSG, good(match), bad(match))) do |corrector|
               invalid_metadata_matches(node) do |match|
-                corrector.replace(match.loc.expression, good(match))
+                corrector.replace(match, good(match))
               end
             end
           end

data/rubocop-default.yml

@@ -13,6 +13,7 @@ inherit_from:
   - rubocop-fips.yml
   - rubocop-gemspec.yml
   - rubocop-graphql.yml
+  - rubocop-internal-affairs.yml
   - rubocop-layout.yml
   - rubocop-lint.yml
   - rubocop-metrics.yml
@@ -23,6 +24,3 @@ inherit_from:
   - rubocop-rspec.yml
   - rubocop-security.yml
   - rubocop-style.yml
-
-InternalAffairs/DeprecateCopHelper:
-  Enabled: false

data/rubocop-gemspec.yml

@@ -4,3 +4,9 @@
 Gemspec/OrderedDependencies:
   Include:
     - '**/*.gemspec'
+
+# Enforce that development dependencies for a gem are specified in Gemfile,
+# rather than in the gemspec using add_development_dependency
+# Reason: Each project may decide to use a different strategy.
+Gemspec/DevelopmentDependencies:
+  Enabled: false

data/rubocop-internal-affairs.yml

@@ -0,0 +1,11 @@
+---
+require:
+  - ./lib/gitlab/styles/rubocop
+
+InternalAffairs/DeprecateCopHelper:
+  Include:
+    - 'spec/rubocop/**/*.rb'
+
+InternalAffairs/MissingCopDepartment:
+  Include:
+    - 'lib/rubocop/cop/**/*.rb'

data/rubocop-lint.yml

@@ -27,10 +27,11 @@ Lint/AmbiguousRange:
 Lint/AmbiguousRegexpLiteral:
   Enabled: true
 
-# This cop checks for assignments in the conditions of
-# if/while/until.
+# This cop checks for assignments in the conditions of if/while/until.
+# Forbid assignments within conditions.
 Lint/AssignmentInCondition:
-  Enabled: false
+  Enabled: true
+  AllowSafeAssignment: false
 
 # Checks for places where binary operator has identical operands
 Lint/BinaryOperatorWithIdenticalOperands:

data/rubocop-rails.yml

@@ -140,7 +140,7 @@ Rails/Output:
 # This cop checks for the use of output safety calls like html_safe and
 # raw.
 Rails/OutputSafety:
-  Enabled: false
+  Enabled: true
 
 # Enforces the use of pluck over map.
 # https://docs.rubocop.org/rubocop-rails/2.8/cops_rails.html#railspluck
@@ -196,6 +196,13 @@ Rails/SquishedSQLHeredocs:
 Rails/TimeZone:
   Enabled: false
 
+# Checks for the use of exit statements (namely return, break and throw) in
+# transactions. This is due to the eventual unexpected behavior when using
+# ActiveRecord >= 7, where transactions exited using these statements are being
+# rollbacked rather than committed (pre ActiveRecord 7 behavior).
+Rails/TransactionExitStatement:
+  Enabled: true
+
 # This cop checks for the use of old-style attribute validation macros.
 Rails/Validation:
   Enabled: true

data/rubocop-rspec.yml

@@ -2,6 +2,11 @@
 require:
   - ./lib/gitlab/styles/rubocop
 
+# Check for create_list FactoryBot declarations higher than MaxAmount
+RSpec/FactoryBot/ExcessiveCreateList:
+  Enabled: true
+  MaxAmount: 10
+
 # Check that instances are not being stubbed globally.
 RSpec/AnyInstance:
   Enabled: false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-styles
 version: !ruby/object:Gem::Version
-  version: 10.0.0
+  version: 10.1.0
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-10 00:00:00.000000000 Z
+date: 2023-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.43.0
+        version: 1.50.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.43.0
+        version: 1.50.2
 - !ruby/object:Gem::Dependency
   name: rubocop-graphql
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.18'
+        version: '2.22'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.18'
+        version: '2.22'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 3.6.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 3.6.7
+- !ruby/object:Gem::Dependency
+  name: lefthook
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.13
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.13
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-parameterized-table_syntax
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +192,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.22.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.22.0
+- !ruby/object:Gem::Dependency
+  name: simplecov-cobertura
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: simplecov-html
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.3
+- !ruby/object:Gem::Dependency
+  name: test_file_finder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.4
 description: 
 email:
 - gitlab_rubygems@gitlab.com
@@ -171,6 +269,7 @@ files:
 - CONTRIBUTING.md
 - Dangerfile
 - Gemfile
+- Gemfile.lock
 - LICENSE.md
 - README.md
 - Rakefile
@@ -201,6 +300,8 @@ files:
 - lib/rubocop/cop/gitlab_security/system_command_injection.rb
 - lib/rubocop/cop/in_batches.rb
 - lib/rubocop/cop/internal_affairs/deprecate_cop_helper.rb
+- lib/rubocop/cop/internal_affairs/missing_cop_department.rb
+- lib/rubocop/cop/internal_affairs/use_restrict_on_send.rb
 - lib/rubocop/cop/line_break_after_guard_clauses.rb
 - lib/rubocop/cop/line_break_around_conditional_block.rb
 - lib/rubocop/cop/migration/update_large_table.rb
@@ -212,8 +313,10 @@ files:
 - lib/rubocop/cop/rspec/empty_line_after_let_block.rb
 - lib/rubocop/cop/rspec/empty_line_after_shared_example.rb
 - lib/rubocop/cop/rspec/example_starting_character.rb
+- lib/rubocop/cop/rspec/factory_bot/excessive_create_list.rb
 - lib/rubocop/cop/rspec/have_link_parameters.rb
 - lib/rubocop/cop/rspec/single_line_hook.rb
+- lib/rubocop/cop/rspec/useless_dynamic_definition.rb
 - lib/rubocop/cop/rspec/verbose_include_metadata.rb
 - lib/rubocop/cop/style/hash_transformation.rb
 - lib/rubocop/cop/style/open_struct_use.rb
@@ -226,6 +329,7 @@ files:
 - rubocop-fips.yml
 - rubocop-gemspec.yml
 - rubocop-graphql.yml
+- rubocop-internal-affairs.yml
 - rubocop-layout.yml
 - rubocop-lint.yml
 - rubocop-metrics.yml