From 686c4ac634dfd4f0810768ce878ed16fb894ec82 Mon Sep 17 00:00:00 2001
From: Andrew Kane <acekane1@gmail.com>
Date: Sat, 23 Jul 2016 18:41:34 -0700
Subject: [PATCH] Updated tests to use ActiveRecord 5 by default

---
 .travis.yml                          | 2 +-
 Gemfile                              | 2 +-
 test/gemfiles/activerecord42.gemfile | 7 +++++++
 test/gemfiles/activerecord50.gemfile | 7 -------
 test/gemfiles/nobrainer.gemfile      | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)
 create mode 100644 test/gemfiles/activerecord42.gemfile
 delete mode 100644 test/gemfiles/activerecord50.gemfile

diff --git a/.travis.yml b/.travis.yml
index c45c822..72813f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ notifications:
     on_failure: change
 gemfile:
   - Gemfile
-  - test/gemfiles/activerecord50.gemfile
+  - test/gemfiles/activerecord42.gemfile
   - test/gemfiles/activerecord41.gemfile
   - test/gemfiles/activerecord40.gemfile
   - test/gemfiles/activerecord32.gemfile
diff --git a/Gemfile b/Gemfile
index 82d1470..80decc6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,5 +4,5 @@ source "https://rubygems.org"
 gemspec
 
 gem "sqlite3"
-gem "activerecord", "~> 4.2.0"
+gem "activerecord", "~> 5.0.0"
 gem "gemoji-parser"
diff --git a/test/gemfiles/activerecord42.gemfile b/test/gemfiles/activerecord42.gemfile
new file mode 100644
index 0000000..52e8cf7
--- /dev/null
+++ b/test/gemfiles/activerecord42.gemfile
@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in searchkick.gemspec
+gemspec path: "../../"
+
+gem "sqlite3"
+gem "activerecord", "~> 4.2.0"
diff --git a/test/gemfiles/activerecord50.gemfile b/test/gemfiles/activerecord50.gemfile
deleted file mode 100644
index d856b1c..0000000
--- a/test/gemfiles/activerecord50.gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in searchkick.gemspec
-gemspec path: "../../"
-
-gem "sqlite3"
-gem "activerecord", "~> 5.0.0.rc1"
diff --git a/test/gemfiles/nobrainer.gemfile b/test/gemfiles/nobrainer.gemfile
index 22afd46..43b17a5 100644
--- a/test/gemfiles/nobrainer.gemfile
+++ b/test/gemfiles/nobrainer.gemfile
@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in searchkick.gemspec
 gemspec path: "../../"
 
-gem "nobrainer", "0.27.0"
+gem "nobrainer"
--
libgit2 0.21.0