Changeset 49

Timestamp:

05/21/2006 16:15:46 (3 years ago)

Author:

tec

Message:

• test/test_markaby.rb: test Builder instead of Template
  

Files:

• trunk/test/test_markaby.rb (modified) (1 diff)

trunk/test/test_markaby.rb

@@ -14 +14 @@
 class MarkabyTest < Test::Unit::TestCase
   
-  def mab(string, assigns = {}, helpers = nil)
-    Markaby::Template.new(string.to_s).render(assigns, helpers)
-  end
-
-  def test_builder_bang_methods
-    assert_equal "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n", mab('instruct!')
+  def mab(*args, &block)
+    Markaby::Builder.new(*args, &block).to_s
   end
 
   def test_simple
-    assert_equal "<hr/>\n", mab("hr")
-    assert_equal "<p>foo</p>\n", mab("p 'foo'")
-    assert_equal "<p>\nfoo</p>\n", mab("p { 'foo' }")
+    assert_equal "<hr/>\n", mab { hr }
+    assert_equal "<p>foo</p>\n", mab { p 'foo' }
+    assert_equal "<p>\nfoo</p>\n", mab { p { 'foo' } }
   end
   
   def test_classes_and_ids
-    assert_equal %{<div class="one"></div>\n}, mab("div.one ''")
-    assert_equal %{<div class="one two"></div>\n}, mab("div.one.two ''")
-    assert_equal %{<div id="three"></div>\n}, mab("div.three! ''")
+    assert_equal %{<div class="one"></div>\n}, mab { div.one '' }
+    assert_equal %{<div class="one two"></div>\n}, mab { div.one.two '' }
+    assert_equal %{<div id="three"></div>\n}, mab { div.three! '' }
   end
   
   def test_escaping
-    assert_equal "<h1>Apples &amp; Oranges</h1>\n", mab("h1 'Apples & Oranges'")
-    assert_equal "<h1>\nApples & Oranges</h1>\n", mab("h1 { 'Apples & Oranges' }")
-    assert_equal "<h1 class=\"fruits&amp;floots\">Apples</h1>\n", mab("h1 'Apples', :class => 'fruits&floots'")
+    assert_equal "<h1>Apples &amp; Oranges</h1>\n", mab { h1 'Apples & Oranges' }
+    assert_equal "<h1>\nApples & Oranges</h1>\n", mab { h1 { 'Apples & Oranges' } }
+    assert_equal "<h1 class=\"fruits&amp;floots\">Apples</h1>\n", mab { h1 'Apples', :class => 'fruits&floots' }
   end
 
   def test_capture
-    html = "<div>\n<h1>hello world</h1>\n</div>\n"
-    assert_equal html, mab("div { h1 'hello world' }")
-    assert_equal html, mab("div { capture { h1 'hello world' } }")
-    assert mab("capture { h1 'hello world' }").empty?
+    builder = Markaby::Builder.new
+    assert builder.to_s.empty?
+    assert_equal "<h1>TEST</h1>\n", builder.capture { h1 'TEST' }
+    assert builder.to_s.empty?
+    assert mab { capture { h1 'hello world' } }.empty?
+    assert_equal mab { div { h1 'TEST' } }, mab { div { capture { h1 'TEST' } } }
   end
 
   def test_ivars
     html = "<div>\n<h1>Steve</h1>\n<div>\n<h2>Gerald</h2>\n</div>\n<h3>Gerald</h3>\n</div>\n"
-    assert_equal html, mab("div { @name = 'Steve'; h1 @name; div { @name = 'Gerald'; h2 @name }; h3 @name }")
-    assert_equal html, mab("div { @name = 'Steve'; h1 @name; self << capture { div { @name = 'Gerald'; h2 @name } }; h3 @name }")
-    assert_equal html, mab("div { h1 @name; self << capture { div { @name = 'Gerald'; h2 @name } }; h3 @name }",
-                           :name => 'Steve')
+    assert_equal html, mab { div { @name = 'Steve'; h1 @name; div { @name = 'Gerald'; h2 @name }; h3 @name } }
+    assert_equal html, mab { div { @name = 'Steve'; h1 @name; self << capture { div { @name = 'Gerald'; h2 @name } }; h3 @name } }
+    assert_equal html, mab(:name => 'Steve') { div { h1 @name; self << capture { div { @name = 'Gerald'; h2 @name } }; h3 @name } }
   end
 
   def test_ivars_without_at_symbol
-    assert_equal "<h1>Hello World</h1>\n", mab("@message = 'Hello World'; h1 message")
+    assert_equal "<h1>Hello World</h1>\n", mab { @message = 'Hello World'; h1 message }
   end
   
   def test_output_helpers
-    assert_equal %{<a href="">edit</a>}, mab("link_to('edit')", {}, MarkabyTestHelpers)
-    assert mab("@output_helpers = false; link_to('edit')", {}, MarkabyTestHelpers).empty?
+    assert_equal %{<a href="">edit</a>}, mab({}, MarkabyTestHelpers) { link_to('edit') }
+    assert mab({}, MarkabyTestHelpers) { @output_helpers = false; link_to('edit') }.empty?
+  end
+
+  def test_builder_bang_methods
+    assert_equal "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n", mab { instruct! }
   end