Merge branch 'master' of github.com:rails/rails

2 files changed, 18 insertions, 0 deletions

diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 54de920740..682a8f3995 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -640,6 +640,7 @@ class FragmentCachingTest < ActionController::TestCase
 
     assert fragment_computed
     assert_equal 'generated till now -> ', buffer
+    ActiveSupport::Notifications.notifier.wait
     assert_equal [:fragment_exist?, :write_fragment], events.map(&:first)
   end
 
diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb
index fee9cf46f9..c1fa74b8c8 100644
--- a/actionpack/test/controller/mime_responds_test.rb
+++ b/actionpack/test/controller/mime_responds_test.rb
@@ -507,6 +507,13 @@ class RespondWithController < ActionController::Base
     end
   end
 
+  def using_responder_with_respond
+    responder = Class.new(ActionController::Responder) do
+      def respond; @controller.render :text => "respond #{format}"; end
+    end
+    respond_with(Customer.new("david", 13), :responder => responder)
+  end
+
 protected
 
   def _render_js(js, options)
@@ -735,6 +742,16 @@ class RespondWithControllerTest < ActionController::TestCase
     assert_equal "foo - #{[:html].to_s}", @controller.response_body
   end
 
+  def test_respond_as_responder_entry_point
+    @request.accept = "text/html"
+    get :using_responder_with_respond
+    assert_equal "respond html", @response.body
+
+    @request.accept = "application/xml"
+    get :using_responder_with_respond
+    assert_equal "respond xml", @response.body
+  end
+
   def test_clear_respond_to
     @controller = InheritedRespondWithController.new
     @request.accept = "text/html"