@@ -32,8 +32,6 @@ class QueryTest < ActiveSupport::TestCase
32
32
:workflows , :journals ,
33
33
:attachments , :time_entries
34
34
35
- INTEGER_KLASS = RUBY_VERSION >= "2.4" ? Integer : Fixnum
36
-
37
35
def setup
38
36
User . current = nil
39
37
end
@@ -1955,7 +1953,7 @@ def test_issue_count_by_association_group
1955
1953
count_by_group = q . result_count_by_group
1956
1954
assert_kind_of Hash , count_by_group
1957
1955
assert_equal %w( NilClass User ) , count_by_group . keys . collect { |k | k . class . name } . uniq . sort
1958
- assert_equal %W( #{ INTEGER_KLASS } ) , count_by_group . values . collect { |k | k . class . name } . uniq
1956
+ assert_equal %W( Integer ) , count_by_group . values . collect { |k | k . class . name } . uniq
1959
1957
assert count_by_group . has_key? ( User . find ( 3 ) )
1960
1958
end
1961
1959
@@ -1964,7 +1962,7 @@ def test_issue_count_by_list_custom_field_group
1964
1962
count_by_group = q . result_count_by_group
1965
1963
assert_kind_of Hash , count_by_group
1966
1964
assert_equal %w( NilClass String ) , count_by_group . keys . collect { |k | k . class . name } . uniq . sort
1967
- assert_equal %W( #{ INTEGER_KLASS } ) , count_by_group . values . collect { |k | k . class . name } . uniq
1965
+ assert_equal %W( Integer ) , count_by_group . values . collect { |k | k . class . name } . uniq
1968
1966
assert count_by_group . has_key? ( 'MySQL' )
1969
1967
end
1970
1968
@@ -1973,7 +1971,7 @@ def test_issue_count_by_date_custom_field_group
1973
1971
count_by_group = q . result_count_by_group
1974
1972
assert_kind_of Hash , count_by_group
1975
1973
assert_equal %w( Date NilClass ) , count_by_group . keys . collect { |k | k . class . name } . uniq . sort
1976
- assert_equal %W( #{ INTEGER_KLASS } ) , count_by_group . values . collect { |k | k . class . name } . uniq
1974
+ assert_equal %W( Integer ) , count_by_group . values . collect { |k | k . class . name } . uniq
1977
1975
end
1978
1976
1979
1977
def test_issue_count_with_nil_group_only
0 commit comments