From 6e8e2f80d14f658108462ac7d9c94e7aeb695e22 Mon Sep 17 00:00:00 2001 From: Andrew Kane Date: Fri, 28 Apr 2017 21:40:44 -0700 Subject: [PATCH] Updated tests to ActiveRecord 5.1 --- .travis.yml | 1 + Gemfile | 2 +- test/gemfiles/activerecord50.gemfile | 7 +++++++ test/gemfiles/activerecord51.gemfile | 7 ------- 4 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 test/gemfiles/activerecord50.gemfile delete mode 100644 test/gemfiles/activerecord51.gemfile diff --git a/.travis.yml b/.travis.yml index 119aeae..9f45550 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,7 @@ notifications: on_failure: change gemfile: - Gemfile + - test/gemfiles/activerecord50.gemfile - test/gemfiles/activerecord42.gemfile - test/gemfiles/mongoid5.gemfile - test/gemfiles/mongoid6.gemfile diff --git a/Gemfile b/Gemfile index adaa4b3..e3d4db3 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ source "https://rubygems.org" gemspec gem "sqlite3" -gem "activerecord", "~> 5.0.0" +gem "activerecord", "~> 5.1.0" gem "gemoji-parser" gem "typhoeus" gem "activejob" diff --git a/test/gemfiles/activerecord50.gemfile b/test/gemfiles/activerecord50.gemfile new file mode 100644 index 0000000..29e80ce --- /dev/null +++ b/test/gemfiles/activerecord50.gemfile @@ -0,0 +1,7 @@ +source 'https://rubygems.org' + +# Specify your gem's dependencies in searchkick.gemspec +gemspec path: "../../" + +gem "sqlite3" +gem "activerecord", "~> 5.0.0" diff --git a/test/gemfiles/activerecord51.gemfile b/test/gemfiles/activerecord51.gemfile deleted file mode 100644 index c7c1251..0000000 --- a/test/gemfiles/activerecord51.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.1.0.beta1" -- libgit2 0.21.0