Fix RuboCop offense Performance/AncestorsInclude (#38146).

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

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 6e7c678bf022386ae996404dd21b5101c7e5a980..332cb9abe8990bc23fd815d4ca7028177fcebaa8 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -486,13 +486,6 @@ Naming/VariableNumber:
     - 'test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb'
     - 'test/unit/project_test.rb'
 
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Performance/AncestorsInclude:
-  Exclude:
-    - 'test/unit/document_category_test.rb'
-    - 'test/unit/issue_priority_test.rb'
-    - 'test/unit/time_entry_activity_test.rb'
-
 # This cop supports safe autocorrection (--autocorrect).
 Performance/BlockGivenWithExplicitBlock:
   Exclude:

diff --git a/test/unit/document_category_test.rb b/test/unit/document_category_test.rb
index 125c199bae4917432ee4ff00564fd4c4dc593675..7ae3962eecd5a8722a16e56b4942a43eb02e34c7 100644 (file)
--- a/test/unit/document_category_test.rb
+++ b/test/unit/document_category_test.rb
@@ -27,7 +27,7 @@ class DocumentCategoryTest < ActiveSupport::TestCase
   end
 
   def test_should_be_an_enumeration
-    assert DocumentCategory.ancestors.include?(Enumeration)
+    assert DocumentCategory <= Enumeration
   end
 
   def test_objects_count

diff --git a/test/unit/issue_priority_test.rb b/test/unit/issue_priority_test.rb
index efd58b71819bb83c44ce87689a6297c05116dbb1..ff192e3178a3b8601e1d4625e73682f56f91b1ea 100644 (file)
--- a/test/unit/issue_priority_test.rb
+++ b/test/unit/issue_priority_test.rb
@@ -49,7 +49,7 @@ class IssuePriorityTest < ActiveSupport::TestCase
   end
 
   def test_should_be_an_enumeration
-    assert IssuePriority.ancestors.include?(Enumeration)
+    assert IssuePriority <= Enumeration
   end
 
   def test_objects_count

diff --git a/test/unit/time_entry_activity_test.rb b/test/unit/time_entry_activity_test.rb
index bfbf534ab7e4b50d8a2a7974e14235ec0155d1e9..09c984f283671d2b62c3e9318bc115f5b8a29d96 100644 (file)
--- a/test/unit/time_entry_activity_test.rb
+++ b/test/unit/time_entry_activity_test.rb
@@ -37,7 +37,7 @@ class TimeEntryActivityTest < ActiveSupport::TestCase
   end
 
   def test_should_be_an_enumeration
-    assert TimeEntryActivity.ancestors.include?(Enumeration)
+    assert TimeEntryActivity <= Enumeration
   end
 
   def test_objects_count