Commit 86528307359692b8e983f2c682fb69706650cf24

Authored by Andrew Kane
1 parent 7c00054a

Test with Rails 6.1 [skip ci]

test/gemfiles/activerecord61.gemfile 0 → 100644
... ... @@ -0,0 +1,16 @@
  1 +source "https://rubygems.org"
  2 +
  3 +gemspec path: "../../"
  4 +
  5 +gem "rake"
  6 +gem "minitest", ">= 5"
  7 +gem "sqlite3"
  8 +gem "activerecord", "~> 6.1.0.rc1"
  9 +gem "actionpack", "~> 6.1.0.rc1"
  10 +gem "activejob", "~> 6.1.0.rc1", require: "active_job"
  11 +gem "elasticsearch", "~> 7"
  12 +gem "elasticsearch-xpack", "~> 7"
  13 +gem "redis"
  14 +gem "connection_pool"
  15 +gem "kaminari"
  16 +gem "gemoji-parser"
... ...
test/pagination_test.rb
... ... @@ -88,7 +88,8 @@ class PaginationTest < Minitest::Test
88 88 I18n.load_path = Dir["test/support/kaminari.yml"]
89 89 I18n.backend.load_translations
90 90  
91   - view = ActionView::Base.new(ActionView::LookupContext.new([]))
  91 + view_args = [[], nil] if ActionView::VERSION::STRING.to_f >= 6.1
  92 + view = ActionView::Base.new(ActionView::LookupContext.new([]), *view_args)
92 93  
93 94 store_names ["Product A"]
94 95 assert_equal "Displaying <b>1</b> product", view.page_entries_info(Product.search("product"))
... ...