3 files changed, 56 insertions, 4 deletions
diff --git a/actionpack/test/controller/http_basic_authentication_test.rb b/actionpack/test/controller/http_basic_authentication_test.rb
index 90548d4294..9052fc6962 100644
--- a/actionpack/test/controller/http_basic_authentication_test.rb
+++ b/actionpack/test/controller/http_basic_authentication_test.rb
@@ -129,6 +129,13 @@ class HttpBasicAuthenticationTest < ActionController::TestCase
     assert_response :unauthorized
   end
 
+  test "authentication request with wrong scheme" do
+    header = 'Bearer ' + encode_credentials('David', 'Goliath').split(' ', 2)[1]
+    @request.env['HTTP_AUTHORIZATION'] = header
+    get :search
+    assert_response :unauthorized
+  end
+
   private
 
   def encode_credentials(username, password)
diff --git a/actionpack/test/controller/mime/respond_with_test.rb b/actionpack/test/controller/mime/respond_with_test.rb
index 416b3b81a5..115f3b2f41 100644
--- a/actionpack/test/controller/mime/respond_with_test.rb
+++ b/actionpack/test/controller/mime/respond_with_test.rb
@@ -2,6 +2,10 @@ require 'abstract_unit'
 require 'controller/fake_models'
 
 class RespondWithController < ActionController::Base
+  class CustomerWithJson < Customer
+    def to_json; super; end
+  end
+
   respond_to :html, :json, :touch
   respond_to :xml, :except => :using_resource_with_block
   respond_to :js,  :only => [ :using_resource_with_block, :using_resource, 'using_hash_resource' ]
@@ -38,6 +42,10 @@ class RespondWithController < ActionController::Base
     respond_with(resource, :location => "http://test.host/", :status => :created)
   end
 
+  def using_resource_with_json
+    respond_with(CustomerWithJson.new("david", request.delete? ? nil : 13))
+  end
+
   def using_invalid_resource_with_template
     respond_with(resource)
   end
@@ -380,9 +388,8 @@ class RespondWithControllerTest < ActionController::TestCase
   end
 
   def test_using_resource_for_put_with_json_yields_no_content_on_success
-    Customer.any_instance.stubs(:to_json).returns('{"name": "David"}')
     @request.accept = "application/json"
-    put :using_resource
+    put :using_resource_with_json
     assert_equal "application/json", @response.content_type
     assert_equal 204, @response.status
     assert_equal "", @response.body
@@ -431,10 +438,9 @@ class RespondWithControllerTest < ActionController::TestCase
   end
 
   def test_using_resource_for_delete_with_json_yields_no_content_on_success
-    Customer.any_instance.stubs(:to_json).returns('{"name": "David"}')
     Customer.any_instance.stubs(:destroyed?).returns(true)
     @request.accept = "application/json"
-    delete :using_resource
+    delete :using_resource_with_json
     assert_equal "application/json", @response.content_type
     assert_equal 204, @response.status
     assert_equal "", @response.body
@@ -643,6 +649,8 @@ class RespondWithControllerTest < ActionController::TestCase
     get :index, format: 'csv'
     assert_equal Mime::CSV, @response.content_type
     assert_equal "c,s,v", @response.body
+  ensure
+    ActionController::Renderers.remove :csv
   end
 
   def test_raises_missing_renderer_if_an_api_behavior_with_no_renderer
@@ -652,6 +660,23 @@ class RespondWithControllerTest < ActionController::TestCase
     end
   end
 
+  def test_removing_renderers
+    ActionController::Renderers.add :csv do |obj, options|
+      send_data obj.to_csv, type: Mime::CSV
+    end
+    @controller = CsvRespondWithController.new
+    @request.accept = "text/csv"
+    get :index, format: 'csv'
+    assert_equal Mime::CSV, @response.content_type
+
+    ActionController::Renderers.remove :csv
+    assert_raise ActionController::MissingRenderer do
+      get :index, format: 'csv'
+    end
+  ensure
+    ActionController::Renderers.remove :csv
+  end
+
   def test_error_is_raised_if_no_respond_to_is_declared_and_respond_with_is_called
     @controller = EmptyRespondWithController.new
     @request.accept = "*/*"
diff --git a/actionpack/test/controller/url_for_test.rb b/actionpack/test/controller/url_for_test.rb
index 0c6df16325..f52f8be101 100644
--- a/actionpack/test/controller/url_for_test.rb
+++ b/actionpack/test/controller/url_for_test.rb
@@ -11,6 +11,26 @@ module AbstractController
         W.default_url_options.clear
       end
 
+      def test_nested_optional
+        klass = Class.new {
+          include ActionDispatch::Routing::RouteSet.new.tap { |r|
+            r.draw {
+              get "/foo/(:bar/(:baz))/:zot", :as         => 'fun',
+                                             :controller => :articles,
+                                             :action     => :index
+            }
+          }.url_helpers
+          self.default_url_options[:host] = 'example.com'
+        }
+
+        path = klass.new.fun_path({:controller => :articles,
+                                   :baz        => "baz",
+                                   :zot        => "zot",
+                                   :only_path  => true })
+        # :bar key isn't provided
+        assert_equal '/foo/zot', path
+      end
+
       def add_host!
         W.default_url_options[:host] = 'www.basecamphq.com'
       end