Fix RuboCop offense Style/ClassEqualityComparison (#39887).

git-svn-id: https://svn.redmine.org/redmine/trunk@22978 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 574a8daabd32b4b5eda231c33bf8ca58a479ced1..3c218d85387e0a10e838efd8c33b472d89d3ca73 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -758,13 +758,6 @@ Style/CaseLikeIf:
 Style/ClassAndModuleChildren:
   Enabled: false
 
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AllowedMethods, AllowedPatterns.
-# AllowedMethods: ==, equal?, eql?
-Style/ClassEqualityComparison:
-  Exclude:
-    - 'app/models/principal.rb'
-
 # This cop supports safe autocorrection (--autocorrect).
 Style/ClassMethods:
   Exclude:

diff --git a/app/models/principal.rb b/app/models/principal.rb
index 6ea19e60ddff9059ceb04d094dcf93511ba70310..59aac3078327a71b3f181bb5e3c1419304156bb7 100644 (file)
--- a/app/models/principal.rb
+++ b/app/models/principal.rb
@@ -159,7 +159,7 @@ class Principal < ApplicationRecord
     return -1 if principal.nil?
     return nil unless principal.is_a?(Principal)
 
-    if self.class.name == principal.class.name
+    if self.instance_of?(principal.class)
       self.to_s.casecmp(principal.to_s)
     else
       # groups after users