diff options
| -rw-r--r-- | Gemfile | 8 | ||||
| -rw-r--r-- | doc/INSTALL | 2 | ||||
| -rw-r--r-- | test/unit/query_test.rb | 8 |
3 files changed, 8 insertions, 10 deletions
@@ -1,6 +1,6 @@ source 'https://rubygems.org' -ruby '>= 2.3.0', '< 2.8.0' +ruby '>= 2.4.0', '< 2.8.0' gem 'bundler', '>= 1.12.0' gem 'rails', '5.2.4.4' @@ -17,7 +17,7 @@ gem "nokogiri", "~> 1.10.0" gem 'i18n', '~> 1.8.2' gem "rbpdf", "~> 1.20.0" gem 'addressable' -gem 'rubyzip', (RUBY_VERSION < '2.4' ? '~> 1.3.0' : '~> 2.3.0') +gem 'rubyzip', '~> 2.3.0' # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin] @@ -85,11 +85,11 @@ end group :test do gem "rails-dom-testing" gem 'mocha', '>= 1.4.0' - gem 'simplecov', (RUBY_VERSION < '2.4' ? '~> 0.17.0' : '~> 0.18.5'), :require => false + gem 'simplecov', '~> 0.18.5', :require => false gem "ffi", platforms: [:mingw, :x64_mingw, :mswin] # For running system tests gem 'puma' - gem 'capybara', (RUBY_VERSION < '2.4' ? '~> 3.15.1' : '~> 3.31.0') + gem 'capybara', '~> 3.31.0' gem "selenium-webdriver" # RuboCop gem 'rubocop', '~> 0.81.0' diff --git a/doc/INSTALL b/doc/INSTALL index 5be44aa06..8dd28ac5d 100644 --- a/doc/INSTALL +++ b/doc/INSTALL @@ -7,7 +7,7 @@ http://www.redmine.org/ == Requirements -* Ruby 2.3, 2.4, 2.5, 2.6, 2.7 (excluding 2.7.0 and 2.7.1) +* Ruby 2.4, 2.5, 2.6, 2.7 (excluding 2.7.0 and 2.7.1) * Bundler >= 1.12.0 * A database: diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb index f0f27b9c0..7be1e799c 100644 --- a/test/unit/query_test.rb +++ b/test/unit/query_test.rb @@ -32,8 +32,6 @@ class QueryTest < ActiveSupport::TestCase :workflows, :journals, :attachments, :time_entries - INTEGER_KLASS = RUBY_VERSION >= "2.4" ? Integer : Fixnum - def setup User.current = nil end @@ -1955,7 +1953,7 @@ class QueryTest < ActiveSupport::TestCase count_by_group = q.result_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(#{INTEGER_KLASS}), count_by_group.values.collect {|k| k.class.name}.uniq + assert_equal %W(Integer), count_by_group.values.collect {|k| k.class.name}.uniq assert count_by_group.has_key?(User.find(3)) end @@ -1964,7 +1962,7 @@ class QueryTest < ActiveSupport::TestCase count_by_group = q.result_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(#{INTEGER_KLASS}), count_by_group.values.collect {|k| k.class.name}.uniq + assert_equal %W(Integer), count_by_group.values.collect {|k| k.class.name}.uniq assert count_by_group.has_key?('MySQL') end @@ -1973,7 +1971,7 @@ class QueryTest < ActiveSupport::TestCase count_by_group = q.result_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(#{INTEGER_KLASS}), count_by_group.values.collect {|k| k.class.name}.uniq + assert_equal %W(Integer), count_by_group.values.collect {|k| k.class.name}.uniq end def test_issue_count_with_nil_group_only |