All
-This
- Should render +All
+This
+Should renderTitle
-- Woah this is really crazy - I mean wow, - man. -
+Title
++Woah this is really crazy +I mean wow, +man. +
Title
-- Woah this is really crazy - I mean wow, - man. -
+Title
++Woah this is really crazy +I mean wow, +man. +
Title
-- Woah this is really crazy - I mean wow, - man. -
+Title
++Woah this is really crazy +I mean wow, +man. +
foo
-reeeeeeeeeeeeeeeeeeeeeeeeeeeeeeally loooooooooooooooooong
+reeeeeeeeeeeeeeeeeeeeeeeeeeeeeeally loooooooooooooooooong
Small
- -foo
-Small
+ +foo
+baz
-boom
+boom
foo -- foo -
+foo +
| - strong! - data - | -- more_data - | -
| +strong! +data + | ++more_data + | +
- Escape - - character - %p foo - yee\ha - don't lstrip me +Escape +- character +%p foo +yee\ha + don't lstrip me
class attribute should appear!
this attribute shouldn't appear
testtestBlah
@@ -64,8 +64,8 @@ Woah inner quotes - hello -
- Foo
+Foo
- Foo
+Foo
- Foo
- Bar
+Foo
+Bar
- Foo
- Bar
+Foo
+Bar
- Foo
- Bar
+Foo
+Bar
- Foo
- Bar
+Foo
+Bar
-
+
- Foo
- Bar
-
+Foo
+Bar
+
-
+
- Foo
- Bar
-
+Foo
+Bar
+
- foo
-
- bar
-
+foo
+
+bar
+
-
- Foo
-
+Foo
+
-
- Foo
-
+Foo
+
-
Foo
Foo
-
Foo
Foo
-
- Foo
-
+Foo
+
-
- Foo
-
+Foo
+
-
Foo
Foo
-
Foo
Foo
-
- Foo
- Bar
-
+Foo
+Bar
+
-
- Foo
- Bar
-
+Foo
+Bar
+
-
- Foo
- Bar
-
Foo
+Bar
-
- Foo
- Bar
-
Foo
+Bar
-
- foo
- Foo
-
bar
-
+foo
+Foo
+
bar
+
-
- foo
- Foo
-
bar
-
+foo
+Foo
+
bar
+
-
- fooFoo
bar
-
+fooFoo
bar
+
-
- fooFoo
bar
-
+fooFoo
bar
+
-
- foo
- Foo
-
bar
-
+foo
+Foo
+
bar
+
-
- foo
- Foo
-
bar
-
+foo
+Foo
+
bar
+
-
- fooFoo
bar
-
+fooFoo
bar
+
-
- fooFoo
bar
-
+fooFoo
bar
+
-
- foo
- Foo
- Bar
-
bar
-
+foo
+Foo
+Bar
+
bar
+
-
- foo
- Foo
- Bar
-
bar
-
+foo
+Foo
+Bar
+
bar
+
-
- foo
- Foo
- Bar
-
bar
-
+fooFoo
+Bar
bar
+
-
- foo
- Foo
- Bar
-
bar
-
+fooFoo
+Bar
bar
+
-
+
-
+
-
+
-
+
diff --git a/test/results/original_engine.xhtml b/test/results/original_engine.xhtml index dd0e9f98..d62f0897 100644 --- a/test/results/original_engine.xhtml +++ b/test/results/original_engine.xhtml @@ -1,20 +1,20 @@ - -
Lorem ipsum dolor sit amet, consectetur adipisicing elit
-Cigarettes!
-This is some text that's in a pre block! - Let's see what happens when it's rendered! What about now, since we're on a new line?-
Lorem ipsum dolor sit amet, consectetur adipisicing elit
+Cigarettes!
+This is some text that's in a pre block! +Let's see what happens when it's rendered! What about now, since we're on a new line?+
Some content within a layout
-Some content within a layout
+ + diff --git a/test/results/partial_layout_erb.xhtml b/test/results/partial_layout_erb.xhtml index 1ac1bc0a..fe433e95 100644 --- a/test/results/partial_layout_erb.xhtml +++ b/test/results/partial_layout_erb.xhtml @@ -1,5 +1,6 @@- @foo = - value one +@foo = +value one
- @foo = - value two +@foo = +value two
- @foo = - value two +@foo = +value two
Toplevel? false- @foo = - value three +@foo = +value three
+- @foo = - value three +@foo = +value three
diff --git a/test/results/silent_script.xhtml b/test/results/silent_script.xhtml index 3b2010d2..b058caf6 100644 --- a/test/results/silent_script.xhtml +++ b/test/results/silent_script.xhtml @@ -1,68 +1,68 @@- "false" is: - false -
- Even! - Odd! - Even! - Odd! - Even! ++"false" is: +false +
+Even! +Odd! +Even! +Odd! +Even!boom
+boom
- Holy cow multiline tags! A pipe (|) even! - PipesIgnored|PipesIgnored|PipesIgnored| - 1|2|3 -
-+Holy cow multiline tags! A pipe (|) even! +PipesIgnored|PipesIgnored|PipesIgnored| +1|2|3 +
+foo bar-
foo bar-
foo bar-
- foo - bar -
+Foo bar +foo bar+
foo bar+
foo bar+
foo +bar
foo bar-
foo bar-
foo bar-
- foo - bar -
- ___
,o88888
,o8888888'
,:o:o:oooo. ,8O88Pd8888"
,.::.::o:ooooOoOoO. ,oO8O8Pd888'"
,.:.::o:ooOoOoOO8O8OOo.8OOPd8O8O"
, ..:.::o:ooOoOOOO8OOOOo.FdO8O8"
, ..:.::o:ooOoOO8O888O8O,COCOO"
, . ..:.::o:ooOoOOOO8OOOOCOCO"
. ..:.::o:ooOoOoOO8O8OCCCC"o
. ..:.::o:ooooOoCoCCC"o:o
. ..:.::o:o:,cooooCo"oo:o:
` . . ..:.:cocoooo"'o:o:::'
.` . ..::ccccoc"'o:o:o:::'
:.:. ,c:cccc"':.:.:.:.:.'
..:.:"'`::::c:"'..:.:.:.:.:.' http://www.chris.com/ASCII/
...:.'.:.::::"' . . . . .'
.. . ....:."' ` . . . ''
. . . ...."'
.. . ."' -hrr-
.
It's a planet!
%strong This shouldn't be bold!
- This should!
-
+Foo bar
+foo bar+
foo bar+
foo bar+
foo +bar
+ ___
,o88888
,o8888888'
,:o:o:oooo. ,8O88Pd8888"
,.::.::o:ooooOoOoO. ,oO8O8Pd888'"
,.:.::o:ooOoOoOO8O8OOo.8OOPd8O8O"
, ..:.::o:ooOoOOOO8OOOOo.FdO8O8"
, ..:.::o:ooOoOO8O888O8O,COCOO"
, . ..:.::o:ooOoOOOO8OOOOCOCO"
. ..:.::o:ooOoOoOO8O8OCCCC"o
. ..:.::o:ooooOoCoCCC"o:o
. ..:.::o:o:,cooooCo"oo:o:
` . . ..:.:cocoooo"'o:o:::'
.` . ..::ccccoc"'o:o:o:::'
:.:. ,c:cccc"':.:.:.:.:.'
..:.:"'`::::c:"'..:.:.:.:.:.' http://www.chris.com/ASCII/
...:.'.:.::::"' . . . . .'
.. . ....:."' ` . . . ''
. . . ...."'
.. . ."' -hrr-
.
It's a planet!
%strong This shouldn't be bold!
+This should!
+
__ ______ __ ______ .----.| |--.|__ |.----.| |--..--------.| __ | | __|| ||__ || __|| < | || __ | |____||__|__||______||____||__|__||__|__|__||______|
foo -bar\ No newline at end of file +bar diff --git a/test/template_test.rb b/test/template_test.rb index 60fc1631..a68e41b6 100644 --- a/test/template_test.rb +++ b/test/template_test.rb @@ -13,7 +13,7 @@ end module Haml::Helpers def test_partial(name, locals = {}) - Haml::Engine.new(File.read(File.join(TemplateTest::TEMPLATE_PATH, "_#{name}.haml"))).render(self, locals) + Haml::Engine.new(File.read(File.join(TemplateTest::TEMPLATE_PATH, "_#{name}.haml")), Haml::Template.options).render(self, locals) end end @@ -82,6 +82,7 @@ class TemplateTest < Haml::TestCase def assert_renders_correctly(name, &render_method) old_options = Haml::Template.options.dup + Haml::Template.options[:ugly] = true Haml::Template.options[:escape_html] = false render_method ||= proc { |n| @base.render(:file => n) } @@ -136,14 +137,14 @@ class TemplateTest < Haml::TestCase def test_templates_should_render_correctly_with_render_proc assert_renders_correctly("standard") do |name| - engine = Haml::Engine.new(File.read(File.dirname(__FILE__) + "/templates/#{name}.haml"), :format => :xhtml) + engine = Haml::Engine.new(File.read(File.dirname(__FILE__) + "/templates/#{name}.haml"), ugly: true, format: :xhtml) engine.render_proc(@base).call end end def test_templates_should_render_correctly_with_def_method assert_renders_correctly("standard") do |name| - engine = Haml::Engine.new(File.read(File.dirname(__FILE__) + "/templates/#{name}.haml"), :format => :xhtml) + engine = Haml::Engine.new(File.read(File.dirname(__FILE__) + "/templates/#{name}.haml"), ugly: true, format: :xhtml) engine.def_method(@base, "render_standard") @base.render_standard end