From 86528307359692b8e983f2c682fb69706650cf24 Mon Sep 17 00:00:00 2001
From: Andrew Kane <andrew@chartkick.com>
Date: Mon, 2 Nov 2020 19:17:50 -0800
Subject: [PATCH] Test with Rails 6.1 [skip ci]

---
 test/gemfiles/activerecord61.gemfile | 16 ++++++++++++++++
 test/pagination_test.rb              |  3 ++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 test/gemfiles/activerecord61.gemfile

diff --git a/test/gemfiles/activerecord61.gemfile b/test/gemfiles/activerecord61.gemfile
new file mode 100644
index 0000000..212f8f9
--- /dev/null
+++ b/test/gemfiles/activerecord61.gemfile
@@ -0,0 +1,16 @@
+source "https://rubygems.org"
+
+gemspec path: "../../"
+
+gem "rake"
+gem "minitest", ">= 5"
+gem "sqlite3"
+gem "activerecord", "~> 6.1.0.rc1"
+gem "actionpack", "~> 6.1.0.rc1"
+gem "activejob", "~> 6.1.0.rc1", require: "active_job"
+gem "elasticsearch", "~> 7"
+gem "elasticsearch-xpack", "~> 7"
+gem "redis"
+gem "connection_pool"
+gem "kaminari"
+gem "gemoji-parser"
diff --git a/test/pagination_test.rb b/test/pagination_test.rb
index ab53587..ed5de83 100644
--- a/test/pagination_test.rb
+++ b/test/pagination_test.rb
@@ -88,7 +88,8 @@ class PaginationTest < Minitest::Test
     I18n.load_path = Dir["test/support/kaminari.yml"]
     I18n.backend.load_translations
 
-    view = ActionView::Base.new(ActionView::LookupContext.new([]))
+    view_args = [[], nil] if ActionView::VERSION::STRING.to_f >= 6.1
+    view = ActionView::Base.new(ActionView::LookupContext.new([]), *view_args)
 
     store_names ["Product A"]
     assert_equal "Displaying <b>1</b> product", view.page_entries_info(Product.search("product"))
--
libgit2 0.21.0