Merge pull request #467 from Shopify/dependabot/bundler/rubocop-1.41.1

Shopify · Jan 2, 2023 · 80be12b · 80be12b
2 parents cb54336 + f553fed
commit 80be12b
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 5 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     rubocop-shopify (2.10.1)
-      rubocop (~> 1.41)
+      rubocop (~> 1.42)
 
 GEM
   remote: https://rubygems.org/
@@ -27,17 +27,17 @@ GEM
     rake (13.0.6)
     regexp_parser (2.6.1)
     rexml (3.2.5)
-    rubocop (1.41.0)
+    rubocop (1.42.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.23.0, < 2.0)
+      rubocop-ast (>= 1.24.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.24.0)
+    rubocop-ast (1.24.1)
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
     unicode-display_width (2.3.0)

diff --git a/rubocop-shopify.gemspec b/rubocop-shopify.gemspec
@@ -23,5 +23,5 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 2.7.0"
 
-  s.add_dependency("rubocop", "~> 1.41")
+  s.add_dependency("rubocop", "~> 1.42")
 end
diff --git a/rubocop.yml b/rubocop.yml
@@ -569,6 +569,9 @@ Style/MapCompactWithConditionalBlock:
 Style/MapToHash:
   Enabled: false
 
+Style/MapToSet:
+  Enabled: false
+
 Style/MethodCallWithArgsParentheses:
   Enabled: true
   AllowedMethods:
@@ -584,6 +587,9 @@ Style/MethodCallWithArgsParentheses:
 Style/MinMax:
   Enabled: false
 
+Style/MinMaxComparison:
+  Enabled: true
+
 Style/MixinGrouping:
   Enabled: false
 
@@ -775,3 +781,6 @@ Style/WordArray:
 
 Style/YodaCondition:
   Enabled: false
+
+Style/YodaExpression:
+  Enabled: false
diff --git a/test/fixtures/full_config.yml b/test/fixtures/full_config.yml
@@ -2540,6 +2540,7 @@ Style/ConcatArrayLiterals:
   Description: Enforces the use of `Array#push(item)` instead of `Array#concat([item])`
     to avoid redundant array literals.
   Enabled: true
+  Safe: false
   VersionAdded: '1.41'
 Style/ConditionalAssignment:
   Description: Use the return value of `if` and `case` statements for assignment to
@@ -3059,6 +3060,11 @@ Style/MapToHash:
   Enabled: false
   VersionAdded: '1.24'
   Safe: false
+Style/MapToSet:
+  Description: Prefer `to_set` with a block over `map.to_set`.
+  Enabled: false
+  Safe: false
+  VersionAdded: '1.42'
 Style/MethodCallWithArgsParentheses:
   Description: Use parentheses for method calls with arguments.
   StyleGuide: "#method-invocation-parens"
@@ -3117,6 +3123,12 @@ Style/MinMax:
     in conjunction.
   Enabled: false
   VersionAdded: '0.50'
+Style/MinMaxComparison:
+  Description: Enforces the use of `max` or `min` instead of comparison for greater
+    or less.
+  Enabled: true
+  Safe: false
+  VersionAdded: '1.42'
 Style/MissingElse:
   Description: Require if/case expressions to have an else branches. If enabled, it
     is recommended that Style/UnlessElse and Style/EmptyElse be enabled. This will
@@ -4096,6 +4108,17 @@ Style/YodaCondition:
   Safe: false
   VersionAdded: '0.49'
   VersionChanged: '0.75'
+Style/YodaExpression:
+  Description: Forbid the use of yoda expressions.
+  Enabled: false
+  Safe: false
+  VersionAdded: '1.42'
+  SupportedOperators:
+  - "*"
+  - "+"
+  - "&"
+  - "|"
+  - "^"
 Style/ZeroLengthPredicate:
   Description: 'Use #empty? when testing for objects of length 0.'
   Enabled: true