Merge pull request #8 from netlify/update-dependencies

Update rubocop dependency to < 2.0
netlify · Mar 29, 2021 · df16396 · df16396
2 parents 7983cf3 + 2df866c
commit df16396
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/lib/rubocop/cop/netlify/invalid_model_assignment.rb b/lib/rubocop/cop/netlify/invalid_model_assignment.rb
@@ -13,7 +13,6 @@ module Netlify
       #   form.email = "bettse@netlify.com"
       class InvalidModelAssignment < Cop
         MSG = "Assigning to `attributes` will not update record"
-        RESTRICT_ON_SEND = [:attributes].freeze
 
         def_node_matcher :assign_attributes?, <<~PATTERN
           (send (send (...) :attributes) :[]= _ _)

diff --git a/rubocop-netlify.gemspec b/rubocop-netlify.gemspec
@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.add_dependency "rubocop", "~> 0.72", "< 0.83"
+  spec.add_dependency "rubocop", "~> 0.72", "< 2.0"
   spec.add_development_dependency "minitest", "~> 5.10"
 
   # Specify which files should be added to the gem when it is released.

diff --git a/test/assertion_helper.rb b/test/assertion_helper.rb
@@ -3,7 +3,6 @@
 # Copied and adapted from:
 # https://github.com/rubocop-hq/rubocop-minitest/blob/v0.8.1/test/assertion_helper.rb
 #
-#
 # ===========
 #
 #
@@ -70,10 +69,10 @@ def inspect_source(source, cop, file = nil)
   end
 
   def investigate(cop, processed_source)
-    forces = RuboCop::Cop::Force.all.each_with_object([]) do |klass, instances|
-      next unless cop.join_force?(klass)
-
-      instances << klass.new([cop])
+    needed = Hash.new { |h, k| h[k] = [] }
+    Array(cop.class.joining_forces).each { |force| needed[force] << cop }
+    forces = needed.map do |force_class, joining_cops|
+      force_class.new(joining_cops)
     end
 
     commissioner = RuboCop::Cop::Commissioner.new([cop], forces, raise_error: true)