Merge pull request #162 from frodsan/fix_edge_tests

Fix failing tests on Rails master

.travis.yml

@@ -11,22 +11,17 @@ 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
-      rvm: 1.9.3
-    - gemfile: gemfiles/Gemfile.edge-rails
-      rvm: rbx-19mode

Gemfile.edge

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gemspec :path => '..'
+gemspec
 
 gem 'rails', github: 'rails/rails'
 

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