4 files changed, 53 insertions, 18 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 84a08770f5..4cf7adfb3c 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -422,6 +422,12 @@ module ActionDispatch
         # [:action]
         #   The route's action.
         #
+        # [:param]
+        #   Overrides the default resource identifier `:id` (name of the
+        #   dynamic segment used to generate the routes).
+        #   You can access that segment from your controller using
+        #   <tt>params[<:param>]</tt>.
+        #
         # [:path]
         #   The path prefix for the routes.
         #
diff --git a/actionpack/test/controller/params_wrapper_test.rb b/actionpack/test/controller/params_wrapper_test.rb
index 11ccb6cf3b..645ecae220 100644
--- a/actionpack/test/controller/params_wrapper_test.rb
+++ b/actionpack/test/controller/params_wrapper_test.rb
@@ -337,14 +337,26 @@ class IrregularInflectionParamsWrapperTest < ActionController::TestCase
   tests ParamswrappernewsController
 
   def test_uses_model_attribute_names_with_irregular_inflection
-    ActiveSupport::Inflector.inflections do |inflect|
-      inflect.irregular 'paramswrappernews_item', 'paramswrappernews'
-    end
+    with_dup do
+      ActiveSupport::Inflector.inflections do |inflect|
+        inflect.irregular 'paramswrappernews_item', 'paramswrappernews'
+      end
 
-    with_default_wrapper_options do
-      @request.env['CONTENT_TYPE'] = 'application/json'
-      post :parse, { 'username' => 'sikachu', 'test_attr' => 'test_value' }
-      assert_parameters({ 'username' => 'sikachu', 'test_attr' => 'test_value', 'paramswrappernews_item' => { 'test_attr' => 'test_value' }})
+      with_default_wrapper_options do
+        @request.env['CONTENT_TYPE'] = 'application/json'
+        post :parse, { 'username' => 'sikachu', 'test_attr' => 'test_value' }
+        assert_parameters({ 'username' => 'sikachu', 'test_attr' => 'test_value', 'paramswrappernews_item' => { 'test_attr' => 'test_value' }})
+      end
     end
   end
+
+  private
+
+  def with_dup
+    original = ActiveSupport::Inflector::Inflections.instance_variable_get(:@__instance__)[:en]
+    ActiveSupport::Inflector::Inflections.instance_variable_set(:@__instance__, en: original.dup)
+    yield
+  ensure
+    ActiveSupport::Inflector::Inflections.instance_variable_set(:@__instance__, en: original)
+  end
 end
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index a427113763..c9777ae71f 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -3478,6 +3478,33 @@ class TestNamespaceWithControllerOption < ActionDispatch::IntegrationTest
     @app.draw(&block)
   end
 
+  def test_missing_controller
+    ex = assert_raises(ArgumentError) {
+      draw do
+        get '/foo/bar', :to => :index
+      end
+    }
+    assert_match(/Missing :controller/, ex.message)
+  end
+
+  def test_missing_action
+    ex = assert_raises(ArgumentError) {
+      draw do
+        get '/foo/bar', :to => 'foo'
+      end
+    }
+    assert_match(/Missing :action/, ex.message)
+  end
+
+  def test_missing_action_on_hash
+    ex = assert_raises(ArgumentError) {
+      draw do
+        get '/foo/bar', :to => 'foo#'
+      end
+    }
+    assert_match(/Missing :action/, ex.message)
+  end
+
   def test_valid_controller_options_inside_namespace
     draw do
       namespace :admin do
diff --git a/actionpack/test/journey/router_test.rb b/actionpack/test/journey/router_test.rb
index 1a2106a3c5..f298808be8 100644
--- a/actionpack/test/journey/router_test.rb
+++ b/actionpack/test/journey/router_test.rb
@@ -4,18 +4,10 @@ require 'abstract_unit'
 module ActionDispatch
   module Journey
     class TestRouter < ActiveSupport::TestCase
-      # TODO : clean up routing tests so we don't need this hack
-      class StubDispatcher < Routing::RouteSet::Dispatcher
-        def initialize
-          super({})
-        end
-        def dispatcher?; true; end
-      end
-
       attr_reader :routes
 
       def setup
-        @app       = StubDispatcher.new
+        @app       = Routing::RouteSet::Dispatcher.new({})
         @routes    = Routes.new
         @router    = Router.new(@routes)
         @formatter = Formatter.new(@routes)
@@ -566,8 +558,6 @@ module ActionDispatch
         end
       end
 
-      RailsEnv = Struct.new(:env)
-
       def rails_env env, klass = ActionDispatch::Request
         klass.new env
       end