gitlab-styles 6.1.0 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ffdef3ce888f639822f2931093c590fa0ef9979fc38ec290f4a7b4a18393b55
-  data.tar.gz: d22d5faa3fbcafe4a899ad1f8315813a5b8dd0d2e9c0baa2aa80cfcf2c56f12a
+  metadata.gz: 8de6943529f148b2e25546b043835e1d00cb06b4b9c88124457b9556830e7c29
+  data.tar.gz: 44f5b72122c8626318a1914eec7e3e462eeab5c479393d2f526b6e4937123131
 SHA512:
-  metadata.gz: 31dc65dd2a632d76307e85f9350babbda6032e9934fa9a6a363a5aecab344ef744a741f5f69c185eea7826391cfea4ad5f02ccda540f35b3b0baf9cecf331e65
-  data.tar.gz: b39f7fead8a619e687543a451a31870b9f3c05f7c06e88b16e2d120c5ae28e71e33edbc333660ce5e8560daee737870f7049f7f2cde776ad21bfd092efab52b6
+  metadata.gz: 35e146b2b436d9801ee242f8867662be1b3b9febe1f6b55eebf951fbe676dfdfffd93d3f0615928940a0b68bcc5e8ea049c23ac035a468db235f28464c32e648
+  data.tar.gz: 9352b19250deedf7a716c576ab3f54b18e855dca95f5a18ed204bbe34ef7d395ed27a75e2dfe7ad00969552f28f474550053e8479e15c35487defe4f73bc9646

data/.gitlab-ci.yml

@@ -14,8 +14,8 @@ workflow:
   rules:
     # For merge requests, create a pipeline.
     - if: '$CI_MERGE_REQUEST_IID'
-    # For `master` branch, create a pipeline (this includes on schedules, pushes, merges, etc.).
-    - if: '$CI_COMMIT_BRANCH == "master"'
+    # For the default branch, create a pipeline (this includes on schedules, pushes, merges, etc.).
+    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
     # For tags, create a pipeline.
     - if: '$CI_COMMIT_TAG'
 

data/lib/gitlab/styles/rubocop/cop/rspec/empty_line_after_final_let_it_be.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'rubocop-rspec'
+require_relative 'base'
+
+module Gitlab
+  module Styles
+    module Rubocop
+      module Cop
+        module RSpec
+          # Checks if there is an empty line after the last `let_it_be` block.
+          #
+          # @example
+          #   # bad
+          #   let_it_be(:foo) { bar }
+          #   let_it_be(:something) { other }
+          #   it { does_something }
+          #
+          #   # good
+          #   let_it_be(:foo) { bar }
+          #   let_it_be(:something) { other }
+          #
+          #   it { does_something }
+          class EmptyLineAfterFinalLetItBe < Base
+            extend RuboCop::Cop::AutoCorrector
+            include RuboCop::RSpec::EmptyLineSeparation
+
+            MSG = 'Add an empty line after the last `let_it_be`.'
+
+            def_node_matcher :let_it_be?, <<-PATTERN
+              {
+                (block (send #rspec? {:let_it_be :let_it_be_with_refind :let_it_be_with_reload} ...) ...)
+                (send #rspec? {:let_it_be :let_it_be_with_refind :let_it_be_with_reload} _ block_pass)
+              }
+            PATTERN
+
+            def on_block(node)
+              return unless example_group_with_body?(node)
+
+              final_let_it_be = node.body.child_nodes.reverse.find { |child| let_it_be?(child) }
+
+              return if final_let_it_be.nil?
+
+              missing_separating_line_offense(final_let_it_be) { MSG }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/styles/rubocop/rspec/helpers.rb

@@ -9,7 +9,8 @@ module Gitlab
         module Helpers
           include RuboCop::RSpec::Language
 
-          LET = SelectorSet.new(%i[let_it_be]) + RuboCop::RSpec::Language::Helpers::ALL
+          LET_IT_BE_HELPERS = SelectorSet.new(%i[let_it_be let_it_be_with_refind let_it_be_with_reload])
+          LET = LET_IT_BE_HELPERS + RuboCop::RSpec::Language::Helpers::ALL
         end
       end
     end

data/lib/gitlab/styles/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module Styles
-    VERSION = '6.1.0'
+    VERSION = '6.2.0'
   end
 end

data/rubocop-performance.yml

@@ -35,6 +35,12 @@ Performance/DoubleStartEndWith:
 Performance/MethodObjectAsBlock: # (new in 1.9)
   Enabled: true
 
+# Use `Struct.new(..., keyword_init: true)` instead of `OpenStruct.new(...)`.
+Performance/OpenStruct:
+  Enabled: true
+  Exclude:
+    - 'spec/**/*'
+
 # Use `Range#cover?` instead of `Range#include?`.
 Performance/RangeInclude:
   Enabled: true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-styles
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.2.0
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-24 00:00:00.000000000 Z
+date: 2021-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -166,6 +166,7 @@ files:
 - lib/gitlab/styles/rubocop/cop/polymorphic_associations.rb
 - lib/gitlab/styles/rubocop/cop/redirect_with_status.rb
 - lib/gitlab/styles/rubocop/cop/rspec/base.rb
+- lib/gitlab/styles/rubocop/cop/rspec/empty_line_after_final_let_it_be.rb
 - lib/gitlab/styles/rubocop/cop/rspec/empty_line_after_let_block.rb
 - lib/gitlab/styles/rubocop/cop/rspec/empty_line_after_shared_example.rb
 - lib/gitlab/styles/rubocop/cop/rspec/example_starting_character.rb