From b898865a851004dc0b5913783088f1eb2ce215f5 Mon Sep 17 00:00:00 2001
From: Andrew Kane <andrew@ankane.org>
Date: Wed, 9 Dec 2020 16:41:32 -0800
Subject: [PATCH] Updated tests to Active Record 6.1

---
 .github/workflows/build.yml     |  3 +++
 Gemfile                         |  6 +++---
 gemfiles/activerecord60.gemfile | 16 ++++++++++++++++
 gemfiles/activerecord61.gemfile | 16 ----------------
 4 files changed, 22 insertions(+), 19 deletions(-)
 create mode 100644 gemfiles/activerecord60.gemfile
 delete mode 100644 gemfiles/activerecord61.gemfile

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8931b87..380b3ac 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,6 +10,9 @@ jobs:
         - ruby: 2.7
           gemfile: Gemfile
           elasticsearch: 7.10.1
+        - ruby: 2.7
+          gemfile: gemfiles/activerecord60.gemfile
+          elasticsearch: 7.10.1
         - ruby: 2.6
           gemfile: gemfiles/activerecord52.gemfile
           elasticsearch: 7.0.0
diff --git a/Gemfile b/Gemfile
index 3a5e7c7..ee9bb57 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,9 +4,9 @@ gemspec
 
 gem "rake"
 gem "minitest", ">= 5"
-gem "activerecord", "~> 6.0.0"
-gem "activejob", "~> 6.0.0", require: "active_job"
-gem "actionpack", "~> 6.0.0"
+gem "activerecord", "~> 6.1.0"
+gem "activejob", "~> 6.1.0", require: "active_job"
+gem "actionpack", "~> 6.1.0"
 gem "sqlite3"
 gem "gemoji-parser"
 gem "typhoeus"
diff --git a/gemfiles/activerecord60.gemfile b/gemfiles/activerecord60.gemfile
new file mode 100644
index 0000000..5f0a453
--- /dev/null
+++ b/gemfiles/activerecord60.gemfile
@@ -0,0 +1,16 @@
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "rake"
+gem "minitest", ">= 5"
+gem "sqlite3"
+gem "activerecord", "~> 6.0.0"
+gem "actionpack", "~> 6.0.0"
+gem "activejob", "~> 6.0.0", require: "active_job"
+gem "elasticsearch", "~> 7"
+gem "elasticsearch-xpack", "~> 7"
+gem "redis"
+gem "connection_pool"
+gem "kaminari"
+gem "gemoji-parser"
diff --git a/gemfiles/activerecord61.gemfile b/gemfiles/activerecord61.gemfile
deleted file mode 100644
index b7b3f1f..0000000
--- a/gemfiles/activerecord61.gemfile
+++ /dev/null
@@ -1,16 +0,0 @@
-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"
--
libgit2 0.21.0