Merge pull request #130 from dgeb/edge-rails-travis

Add edge rails to the Travis test matrix

.travis.yml

@@ -1,7 +1,27 @@
+language: ruby
 rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
   - ree
   - jruby
-  - rbx
+  - rbx
+gemfile:
+  - Gemfile
+  - gemfiles/Gemfile.edge-rails
+matrix:
+  exclude:
+    # Edge Rails is only compatible with 1.9.3
+    - gemfile: gemfiles/Gemfile.edge-rails
+      rvm: 1.8.7
+    - gemfile: gemfiles/Gemfile.edge-rails
+      rvm: 1.9.2
+    - gemfile: gemfiles/Gemfile.edge-rails
+      rvm: ree
+    - gemfile: gemfiles/Gemfile.edge-rails
+      rvm: jruby
+    - gemfile: gemfiles/Gemfile.edge-rails
+      rvm: rbx
+  allow_failures:
+    - gemfile: gemfiles/Gemfile.edge-rails
+      rvm: 1.9.3

gemfiles/Gemfile.edge-rails

@@ -0,0 +1,9 @@
+source 'http://rubygems.org'
+
+gemspec :path => '..'
+
+gem 'rails', github: 'rails/rails'
+
+# Current dependencies of edge rails
+gem 'journey', github: 'rails/journey'
+gem 'activerecord-deprecated_finders' , github: 'rails/activerecord-deprecated_finders'

test/test_helper.rb

@@ -21,8 +21,8 @@ module TestHelper
   Routes = ActionDispatch::Routing::RouteSet.new
   Routes.draw do
     resource :hypermedia
-    match ':controller(/:action(/:id))'
-    match ':controller(/:action)'
+    get ':controller(/:action(/:id))'
+    get ':controller(/:action)'
   end
 
   ActionController::Base.send :include, Routes.url_helpers