From b224d50005bdc3b6f0ffc764a4b5b2a044a33c07 Mon Sep 17 00:00:00 2001 From: Tony Ta Date: Sun, 26 Apr 2015 18:10:37 -0700 Subject: [PATCH] removes test env for incompatible Rails 3.2 and adds Rails 4.2 gemspec requires "rails" and "activemodel, ">= 4.0", so testing on 3.2 will always fail to resolve dependencies. adds and defaults to Rails 4.2 when RAILS_VERSION is not specified --- .travis.yml | 3 +-- Gemfile | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6ce693ad6..6ebfd7032 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,13 +15,12 @@ install: - bundle install --retry=3 env: - - "RAILS_VERSION=3.2" - "RAILS_VERSION=4.0" - "RAILS_VERSION=4.1" + - "RAILS_VERSION=4.2" - "RAILS_VERSION=master" matrix: allow_failures: - rvm: ruby-head - env: "RAILS_VERSION=master" - - env: "RAILS_VERSION=3.2" diff --git a/Gemfile b/Gemfile index 25b466ebf..baf12948d 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ gemspec gem "minitest" -version = ENV["RAILS_VERSION"] || "4.1" +version = ENV["RAILS_VERSION"] || "4.2" if version == "master" gem "rails", github: "rails/rails"