summaryrefslogtreecommitdiffstats
path: root/test/unit
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2017-03-02 22:48:48 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2017-03-02 22:48:48 +0000
commit2d21ca082e047d37287f01f760fadf9b331d082b (patch)
treec0f5b2b4426c99244291308b01398611636a2d6a /test/unit
parenteaf8fb9885e17e8f7755a2a3ac8d3d897c7f5469 (diff)
downloadredmine-2d21ca082e047d37287f01f760fadf9b331d082b.tar.gz
redmine-2d21ca082e047d37287f01f760fadf9b331d082b.zip
Ruby 2.4: Fixed "Fixnum is deprecated" warning in QueryTest. (#25048).
Patch by Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/trunk@16355 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/unit')
-rw-r--r--test/unit/query_test.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb
index aced780f1..31a4ac2d3 100644
--- a/test/unit/query_test.rb
+++ b/test/unit/query_test.rb
@@ -32,6 +32,8 @@ class QueryTest < ActiveSupport::TestCase
:workflows,
:attachments
+ INTEGER_KLASS = RUBY_VERSION >= "2.4" ? Integer : Fixnum
+
def setup
User.current = nil
end
@@ -1612,7 +1614,7 @@ class QueryTest < ActiveSupport::TestCase
count_by_group = q.issue_count_by_group
assert_kind_of Hash, count_by_group
assert_equal %w(NilClass User), count_by_group.keys.collect {|k| k.class.name}.uniq.sort
- assert_equal %w(Fixnum), count_by_group.values.collect {|k| k.class.name}.uniq
+ assert_equal %W(#{INTEGER_KLASS}), count_by_group.values.collect {|k| k.class.name}.uniq
assert count_by_group.has_key?(User.find(3))
end
@@ -1621,7 +1623,7 @@ class QueryTest < ActiveSupport::TestCase
count_by_group = q.issue_count_by_group
assert_kind_of Hash, count_by_group
assert_equal %w(NilClass String), count_by_group.keys.collect {|k| k.class.name}.uniq.sort
- assert_equal %w(Fixnum), count_by_group.values.collect {|k| k.class.name}.uniq
+ assert_equal %W(#{INTEGER_KLASS}), count_by_group.values.collect {|k| k.class.name}.uniq
assert count_by_group.has_key?('MySQL')
end
@@ -1630,7 +1632,7 @@ class QueryTest < ActiveSupport::TestCase
count_by_group = q.issue_count_by_group
assert_kind_of Hash, count_by_group
assert_equal %w(Date NilClass), count_by_group.keys.collect {|k| k.class.name}.uniq.sort
- assert_equal %w(Fixnum), count_by_group.values.collect {|k| k.class.name}.uniq
+ assert_equal %W(#{INTEGER_KLASS}), count_by_group.values.collect {|k| k.class.name}.uniq
end
def test_issue_count_with_nil_group_only