Merge commit 'rails/master'

Conflicts:
	railties/guides/source/index.html.erb

1 files changed, 6 insertions, 0 deletions

diff --git a/actionpack/test/template/form_tag_helper_test.rb b/actionpack/test/template/form_tag_helper_test.rb
index 8756bd310f..abb0e1df93 100644
--- a/actionpack/test/template/form_tag_helper_test.rb
+++ b/actionpack/test/template/form_tag_helper_test.rb
@@ -59,6 +59,12 @@ class FormTagHelperTest < ActionView::TestCase
     assert_dom_equal expected, actual
   end
 
+  def test_form_tag_with_remote_false
+    actual = form_tag({}, :remote => false)
+    expected = %(<form action="http://www.example.com" method="post">)
+    assert_dom_equal expected, actual
+  end
+
   def test_form_tag_with_block_in_erb
     output_buffer = form_tag("http://example.com") { concat "Hello world!" }