1 files changed, 34 insertions, 12 deletions
diff --git a/actionpack/test/template/erb/tag_helper_test.rb b/actionpack/test/template/erb/tag_helper_test.rb
index d9ca828b43..b91539ef0b 100644
--- a/actionpack/test/template/erb/tag_helper_test.rb
+++ b/actionpack/test/template/erb/tag_helper_test.rb
@@ -1,6 +1,28 @@
 require "abstract_unit"
 
 module ERBTest
+  class ViewContext
+    mock_controller = Class.new do
+      include SharedTestRoutes.url_helpers
+    end
+
+    include ActionView::Helpers::TagHelper
+    include ActionView::Helpers::JavaScriptHelper
+    include ActionView::Helpers::FormHelper
+
+    attr_accessor :output_buffer
+
+    def protect_against_forgery?() false end
+
+    define_method(:controller) do
+      mock_controller.new
+    end
+  end
+
+  class DeprecatedViewContext < ViewContext
+    include ActionView::Helpers::DeprecatedBlockHelpers
+  end
+
   module SharedTagHelpers
     extend ActiveSupport::Testing::Declarative
 
@@ -22,16 +44,21 @@ module ERBTest
       expected_output = "<script id=\"the_js_tag\" type=\"text/javascript\">\n//<![CDATA[\nalert('Hello')\n//]]>\n</script>"
       assert_equal expected_output, render_content("javascript_tag(:id => 'the_js_tag')", "alert('Hello')")
     end
+
+    test "percent equals works with form tags" do
+      expected_output = "<form action=\"foo\" method=\"post\">hello</form>"
+      assert_equal expected_output, render_content("form_tag('foo')", "<%= 'hello' %>")
+    end
+
+    test "percent equals works with fieldset tags" do
+      expected_output = "<fieldset><legend>foo</legend>hello</fieldset>"
+      assert_equal expected_output, render_content("field_set_tag('foo')", "<%= 'hello' %>")
+    end
   end
 
   class TagHelperTest < ActiveSupport::TestCase
     def context
-      Class.new do
-        include ActionView::Helpers::TagHelper
-        include ActionView::Helpers::JavaScriptHelper
-
-        attr_accessor :output_buffer
-      end
+      ViewContext
     end
 
     def block_helper(str, rest)
@@ -43,12 +70,7 @@ module ERBTest
 
   class DeprecatedTagHelperTest < ActiveSupport::TestCase
     def context
-      Class.new do
-        include ActionView::Helpers::TagHelper
-        include ActionView::Helpers::JavaScriptHelper
-        include ActionView::Helpers::DeprecatedBlockHelpers
-        attr_accessor :output_buffer
-      end
+      DeprecatedViewContext
     end
 
     def block_helper(str, rest)