1 files changed, 11 insertions, 0 deletions
diff --git a/actionpack/test/controller/request_forgery_protection_test.rb b/actionpack/test/controller/request_forgery_protection_test.rb
index 77db4969a7..8d4b76849f 100644
--- a/actionpack/test/controller/request_forgery_protection_test.rb
+++ b/actionpack/test/controller/request_forgery_protection_test.rb
@@ -40,6 +40,10 @@ module RequestForgeryProtectionActions
     render :inline => "<%= form_for(:some_resource, :remote => true ) {} %>"
   end
 
+  def form_for_remote_with_token
+    render :inline => "<%= form_for(:some_resource, :remote => true, :authenticity_token => true ) {} %>"
+  end
+
   def rescue_action(e) raise e end
 end
 
@@ -111,6 +115,13 @@ module RequestForgeryProtectionTests
     assert_no_match /authenticity_token/, response.body
   end
 
+  def test_should_render_form_with_token_tag_if_remote_and_authenticity_token_requested
+    assert_not_blocked do
+      get :form_for_remote_with_token
+    end
+    assert_select 'form>div>input[name=?][value=?]', 'custom_authenticity_token', @token
+  end
+
   def test_should_allow_get
     assert_not_blocked { get :index }
   end