1 files changed, 22 insertions, 1 deletions
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index c6e6ed4d6b..3689b17877 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'erb'
 require 'abstract_unit'
 require 'controller/fake_controllers'
@@ -156,7 +157,8 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
         end
 
         resources :posts do
-          get  :archive, :toggle_view, :on => :collection
+          get :archive, :on => :collection
+          get :toggle_view, :on => :collection
           post :preview, :on => :member
 
           resource :subscription
@@ -2543,3 +2545,22 @@ class TestUriPathEscaping < ActionDispatch::IntegrationTest
     assert_equal 'a b/c+d', @response.body
   end
 end
+
+class TestUnicodePaths < ActionDispatch::IntegrationTest
+  Routes = ActionDispatch::Routing::RouteSet.new.tap do |app|
+    app.draw do
+      match "/#{Rack::Utils.escape("ほげ")}" => lambda { |env|
+        path_params = env['action_dispatch.request.path_parameters']
+        [200, { 'Content-Type' => 'text/plain' }, []]
+      }, :as => :unicode_path
+    end
+  end
+
+  include Routes.url_helpers
+  def app; Routes end
+
+  test 'recognizes unicode path' do
+    get "/#{Rack::Utils.escape("ほげ")}"
+    assert_equal "200", @response.code
+  end
+end