From 386c04d86b1d0a5f60651ce056284c874fc43a6f Mon Sep 17 00:00:00 2001 From: MAEDA Go Date: Tue, 28 Feb 2017 15:05:09 +0900 Subject: [PATCH 3/3] Ruby 2.4: Fixed "Fixnum is deprecated" warning in QueryTest. --- test/unit/query_test.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb index 81f6251..013d8c6 100644 --- a/test/unit/query_test.rb +++ b/test/unit/query_test.rb @@ -31,6 +31,8 @@ class QueryTest < ActiveSupport::TestCase :custom_fields_trackers, :workflows + INTEGER_KLASS = RUBY_VERSION >= "2.4" ? Integer : Fixnum + def setup User.current = nil end @@ -1579,7 +1581,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 @@ -1588,7 +1590,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 @@ -1597,7 +1599,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 -- 2.10.1 (Apple Git-78)