From 6be6599bb76f58d49ceb446d20efb68d1310b484 Mon Sep 17 00:00:00 2001 From: Francesco Rodriguez Date: Sun, 25 Nov 2012 14:56:58 -0500 Subject: [PATCH 1/3] Fix failing tests on Rails master --- test/generators_test.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/generators_test.rb b/test/generators_test.rb index 5b0b657e..e37ebe09 100644 --- a/test/generators_test.rb +++ b/test/generators_test.rb @@ -1,6 +1,10 @@ require 'test_helper' class Foo < Rails::Application + if Rails.version.start_with? '4' + config.eager_load = false + config.secret_key_base = 'abc123' + end end Rails.application.load_generators From 7a0092ab32bcbfdadb3fe54f74a8aa52c843915e Mon Sep 17 00:00:00 2001 From: Francesco Rodriguez Date: Sun, 25 Nov 2012 14:58:59 -0500 Subject: [PATCH 2/3] move gemfiles/Gemfile.edge to root --- .travis.yml | 16 ++++++++-------- gemfiles/Gemfile.edge-rails => Gemfile.edge | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) rename gemfiles/Gemfile.edge-rails => Gemfile.edge (91%) diff --git a/.travis.yml b/.travis.yml index 71ac978e..9dcacdd9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,22 +11,22 @@ rvm: - rbx-19mode gemfile: - Gemfile - - gemfiles/Gemfile.edge-rails + - Gemfile.edge matrix: exclude: # Edge Rails is only compatible with 1.9.3 - - gemfile: gemfiles/Gemfile.edge-rails + - gemfile: Gemfile.edge rvm: 1.8.7 - - gemfile: gemfiles/Gemfile.edge-rails + - gemfile: Gemfile.edge rvm: 1.9.2 - - gemfile: gemfiles/Gemfile.edge-rails + - gemfile: Gemfile.edge rvm: ree - - gemfile: gemfiles/Gemfile.edge-rails + - gemfile: Gemfile.edge rvm: jruby - - gemfile: gemfiles/Gemfile.edge-rails + - gemfile: Gemfile.edge rvm: rbx-18mode allow_failures: - - gemfile: gemfiles/Gemfile.edge-rails + - gemfile: Gemfile.edge rvm: 1.9.3 - - gemfile: gemfiles/Gemfile.edge-rails + - gemfile: Gemfile.edge rvm: rbx-19mode diff --git a/gemfiles/Gemfile.edge-rails b/Gemfile.edge similarity index 91% rename from gemfiles/Gemfile.edge-rails rename to Gemfile.edge index a8f7440c..d4e1c028 100644 --- a/gemfiles/Gemfile.edge-rails +++ b/Gemfile.edge @@ -1,6 +1,6 @@ source 'http://rubygems.org' -gemspec :path => '..' +gemspec gem 'rails', github: 'rails/rails' From 6e2988eec7cff4ec6ac2f5bd8e3104a873c9ccfe Mon Sep 17 00:00:00 2001 From: Francesco Rodriguez Date: Sun, 25 Nov 2012 14:59:25 -0500 Subject: [PATCH 3/3] no need to allow failures --- .travis.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9dcacdd9..d120decc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,8 +25,3 @@ matrix: rvm: jruby - gemfile: Gemfile.edge rvm: rbx-18mode - allow_failures: - - gemfile: Gemfile.edge - rvm: 1.9.3 - - gemfile: Gemfile.edge - rvm: rbx-19mode