Fix rubocop issues

nepalez · Apr 3, 2021 · 50aee33 · 50aee33
1 parent 9f982f0
commit 50aee33
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -5,15 +5,20 @@ AllCops:
   DisplayCopNames:    true
   DisplayStyleGuide:  true
   StyleGuideCopsOnly: true
-  TargetRubyVersion:  2.3
+  TargetRubyVersion:  2.4
+  NewCops: enable
 
 Layout/LineLength:
   AllowHeredoc: true
   AllowURI: true
   URISchemes:
     - http
     - https
-
+
+Lint/ConstantDefinitionInBlock:
+  Exclude:
+    - spec/**/*.*
+
 Style/ClassAndModuleChildren:
   Enabled: false
 

diff --git a/lib/fixturama/changes/base.rb b/lib/fixturama/changes/base.rb
@@ -14,7 +14,7 @@ class Base
     # @return [Fixturama::Changes::Base]
     def merge(other)
       # By default just take the other change if applicable
-      other.class == self.class && other.key == key ? other : self
+      other.instance_of?(self.class) && other.key == key ? other : self
     end
 
     # @abstract

diff --git a/lib/fixturama/changes/chain.rb b/lib/fixturama/changes/chain.rb
@@ -14,7 +14,7 @@ def key
     end
 
     def merge(other)
-      return self unless other.class == self.class && other.key == key
+      return self unless other.instance_of?(self.class) && other.key == key
 
       tap { @arguments = (other.arguments | arguments).sort_by(&:order) }
     end