aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2012-08-07 11:44:24 -0500
committerDavid Heinemeier Hansson <david@loudthinking.com>2012-08-07 11:44:24 -0500
commit666d3fd0c156a5c47eeddfe87dc466863890ba70 (patch)
tree48efad07255a30ea809921b1983899e21d409523 /actionpack/test
parentfb883318c8b82b3570cee022ddf6886f9052245d (diff)
downloadrails-666d3fd0c156a5c47eeddfe87dc466863890ba70.tar.gz
rails-666d3fd0c156a5c47eeddfe87dc466863890ba70.tar.bz2
rails-666d3fd0c156a5c47eeddfe87dc466863890ba70.zip
Revert "Merge pull request #7033 from kron4eg/master". Not a a fan at all of what this makes ERB files look like.
This reverts commit 46b8bceedd3e47169c50a04c93161424909c75fb, reversing changes made to 2f58795e783150f2e1b1f6c64e305703f0061129.
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/template/erb/handlers_test.rb54
1 files changed, 0 insertions, 54 deletions
diff --git a/actionpack/test/template/erb/handlers_test.rb b/actionpack/test/template/erb/handlers_test.rb
deleted file mode 100644
index 7cd9c7fbcb..0000000000
--- a/actionpack/test/template/erb/handlers_test.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-require "abstract_unit"
-
-class HandlersTest < ActiveSupport::TestCase
- HANDLER = ActionView::Template::Handlers::ERB
- Template = Struct.new(:source)
-
- extend ActiveSupport::Testing::Declarative
-
- test "content is not trimmed without a trim mode" do
- with_erb_trim_mode nil do
- assert_equal(" \ntest", render(" <% 'IGNORED' %> \ntest"))
- end
- end
-
- test "content around tags is trimmed if the trim mode includes a dash" do
- with_erb_trim_mode '-' do
- assert_equal("test", render(" <% 'IGNORED' %> \ntest"))
- end
- end
-
- test "percent lines are normal content without a trim mode" do
- with_erb_trim_mode nil do
- assert_equal( "% if false\noops\n% end\n",
- render("% if false\noops\n% end\n") )
- end
- end
-
- test "percent lines count as ruby if trim mode includes a percent" do
- with_erb_trim_mode "%" do
- assert_equal("", render("% if false\noops\n% end\n"))
- end
- end
-
- test "both trim modes can be used at the same time" do
- with_erb_trim_mode "%-" do
- assert_equal( "test", render( "% if false\noops\n% end\n" +
- " <% 'IGNORED' %> \ntest" ) )
- end
- end
-
- private
-
- def with_erb_trim_mode(mode)
- @old_erb_trim_mode = HANDLER.erb_trim_mode
- HANDLER.erb_trim_mode = mode
- yield
- ensure
- HANDLER.erb_trim_mode = @old_erb_trim_mode
- end
-
- def render(template)
- eval("output_buffer = nil; " + HANDLER.call(Template.new(template)))
- end
-end