4 files changed, 34 insertions, 3 deletions
diff --git a/actionpack/test/dispatch/cookies_test.rb b/actionpack/test/dispatch/cookies_test.rb
index 6ebd02e85c..3e48d97e67 100644
--- a/actionpack/test/dispatch/cookies_test.rb
+++ b/actionpack/test/dispatch/cookies_test.rb
@@ -245,6 +245,17 @@ class CookiesTest < ActionController::TestCase
     assert_cookie_header "user_name=; path=/beaten; expires=Thu, 01-Jan-1970 00:00:00 GMT"
   end
 
+  def test_deleted_cookie_predicate
+    cookies.delete("user_name")
+    assert cookies.deleted?("user_name")
+    assert_equal false, cookies.deleted?("another")
+  end
+
+  def test_deleted_cookie_predicate_with_mismatching_options
+    cookies.delete("user_name", :path => "/path")
+    assert_equal false, cookies.deleted?("user_name", :path => "/different")
+  end
+
   def test_cookies_persist_throughout_request
     response = get :authenticate
     assert response.headers["Set-Cookie"] =~ /user_name=david/
diff --git a/actionpack/test/dispatch/debug_exceptions_test.rb b/actionpack/test/dispatch/debug_exceptions_test.rb
index c3a565990e..11c292d61a 100644
--- a/actionpack/test/dispatch/debug_exceptions_test.rb
+++ b/actionpack/test/dispatch/debug_exceptions_test.rb
@@ -34,7 +34,7 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
       when "/unprocessable_entity"
         raise ActionController::InvalidAuthenticityToken
       when "/not_found_original_exception"
-        raise ActionView::Template::Error.new('template', {}, AbstractController::ActionNotFound.new)
+        raise ActionView::Template::Error.new('template', AbstractController::ActionNotFound.new)
       else
         raise "puke!"
       end
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index c6e6ed4d6b..93f5419487 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,21 @@ 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|
+        [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
diff --git a/actionpack/test/dispatch/show_exceptions_test.rb b/actionpack/test/dispatch/show_exceptions_test.rb
index 4a6d5ddbf7..45f8fc11b3 100644
--- a/actionpack/test/dispatch/show_exceptions_test.rb
+++ b/actionpack/test/dispatch/show_exceptions_test.rb
@@ -11,7 +11,7 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest
       when "/method_not_allowed"
         raise ActionController::MethodNotAllowed
       when "/not_found_original_exception"
-        raise ActionView::Template::Error.new('template', {}, AbstractController::ActionNotFound.new)
+        raise ActionView::Template::Error.new('template', AbstractController::ActionNotFound.new)
       else
         raise "puke!"
       end