drop-ruby-2_3.diff

Go MAEDA, 2020-10-20 12:20

Download (3.11 KB)

View differences:

Gemfile (作業コピー)
1 1
source 'https://rubygems.org'
2 2

  
3
ruby '>= 2.3.0', '< 2.8.0'
3
ruby '>= 2.4.0', '< 2.8.0'
4 4
gem 'bundler', '>= 1.12.0'
5 5

  
6 6
gem 'rails', '5.2.4.4'
......
17 17
gem 'i18n', '~> 1.8.2'
18 18
gem "rbpdf", "~> 1.20.0"
19 19
gem 'addressable'
20
gem 'rubyzip', (RUBY_VERSION < '2.4' ? '~> 1.3.0' : '~> 2.3.0')
20
gem 'rubyzip', '~> 2.3.0'
21 21

  
22 22
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
23 23
gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin]
......
85 85
group :test do
86 86
  gem "rails-dom-testing"
87 87
  gem 'mocha', '>= 1.4.0'
88
  gem 'simplecov', (RUBY_VERSION < '2.4' ? '~> 0.17.0' : '~> 0.18.5'), :require => false
88
  gem 'simplecov', '~> 0.18.5', :require => false
89 89
  gem "ffi", platforms: [:mingw, :x64_mingw, :mswin]
90 90
  # For running system tests
91 91
  gem 'puma'
92
  gem 'capybara', (RUBY_VERSION < '2.4' ? '~> 3.15.1' : '~> 3.31.0')
92
  gem 'capybara', '~> 3.31.0'
93 93
  gem "selenium-webdriver"
94 94
  # RuboCop
95 95
  gem 'rubocop', '~> 0.81.0'
doc/INSTALL (作業コピー)
7 7

  
8 8
== Requirements
9 9

  
10
* Ruby 2.3, 2.4, 2.5, 2.6, 2.7 (excluding 2.7.0 and 2.7.1)
10
* Ruby 2.4, 2.5, 2.6, 2.7 (excluding 2.7.0 and 2.7.1)
11 11
* Bundler >= 1.12.0
12 12

  
13 13
* A database:
test/unit/query_test.rb (作業コピー)
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 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 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 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