From c8d9ee4ae3b62ff9427ce9485a7447296e1ae7ef Mon Sep 17 00:00:00 2001 From: Arthur Neves Date: Wed, 27 Aug 2014 10:53:34 -0400 Subject: [PATCH 1/3] Fix rails 4.0.x build --- test/test_helper.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/test_helper.rb b/test/test_helper.rb index 3fd3776c..b7875f75 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -5,6 +5,8 @@ require 'action_controller' require 'action_controller/test_case' require "active_support/json" require 'minitest/autorun' +# Ensure backward compatibility with Minitest 4 +Minitest::Test = MiniTest::Unit::TestCase unless defined?(Minitest::Test) require "active_model_serializers" From fbf8633041cc10f2d5a27118a138802932e2a334 Mon Sep 17 00:00:00 2001 From: Arthur Neves Date: Wed, 27 Aug 2014 10:54:14 -0400 Subject: [PATCH 2/3] Dont allow failures on 4.0.x --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 49262de1..d54edc2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,4 @@ matrix: allow_failures: - rvm: ruby-head - env: "RAILS_VERSION=master" - - env: "RAILS_VERSION=4.0" - env: "RAILS_VERSION=3.2" - From 373c35959a322eea13c7d8c19196ac2700dc20a0 Mon Sep 17 00:00:00 2001 From: Arthur Neves Date: Wed, 27 Aug 2014 10:54:38 -0400 Subject: [PATCH 3/3] Add .ruby-version to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index f61f58b8..838a74e0 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ test/tmp test/version_tmp tmp *.swp +.ruby-version \ No newline at end of file