masterview 0.2.5 → 0.3.0

data/test/unit/template_test.rb

@@ -6,10 +6,88 @@ require File.join( currentPath, '../../lib/masterview' )
 require File.join( currentPath, '../test_helper' )
 
 class TestTemplate < Test::Unit::TestCase
+  DEBUG_DIRECTIVES_REGISTRY = false
   def setup
-    MasterView::IOMgr.erb = MasterView::StringHashMIOTree.new({}, '.rhtml', :logging => true)
+    MasterView::IOMgr.erb = MasterView::MIO::StringHashMIOTree.new({}, '.rhtml', :logging => true)
+    # ensure that the system load path and directives registry are in standard state
+    MasterView::DirectiveLoadPath.reset_current()
+    MasterView::DirectiveRegistry.current.process_directives_load_path(MasterView::DirectiveLoadPath.current)  # load directives and build maps
+    if DEBUG_DIRECTIVES_REGISTRY
+      STDOUT.puts "\n###TestTemplate reset load path and directives registry"
+      STDOUT.puts "...DirectiveLoadPath.current=#{MasterView::DirectiveLoadPath.current.inspect}"
+      STDOUT.puts "...DirectiveRegistry.current.mv_namespace_prefix: #{MasterView::DirectiveRegistry.current.mv_namespace_prefix}"
+      STDOUT.puts "...DirectiveRegistry.current.loaded_classes: #{MasterView::DirectiveRegistry.current.loaded_classes.size}"
+      STDOUT.puts "...DirectiveRegistry.current.loaded_namespaces: #{MasterView::DirectiveRegistry.current.loaded_namespaces.inspect}"
+      problems = []
+      nBuiltins = 0
+      MasterView::DirectiveRegistry.current.registered_directives.each { |dc|
+        if dc.default_namespace_prefix == 'mv:' or dc.name.starts_with?('MasterView::Directives::')
+          nBuiltins += 1
+          problems << dc.name.split(':').last if dc.namespace != 'mv'
+        end
+      }
+      problems.sort!
+      STDOUT.puts problems.empty? ? "...all #{nBuiltins} builtin directives ok" : "*****#{problems.size} of #{nBuiltins} MIS-REGISTERED: #{problems}"
+      STDOUT.puts ""
+    end
+  end
+
+  # test that xml declaration is retained in output
+  def test_xml_decl_basic
+    template = %Q{<?xml version="1.0" ?>\n<greeting mv:generate="foo/bar"><hello>World</hello></greeting>}
+    expected = {
+      'foo/bar' => %Q{<?xml version="1.0" ?>\n<greeting><hello>World</hello></greeting>}
+    }
+    assert_template_result expected, template, {}, nil, false # lets not normalize whitespace so we can see if newlines are in there
+  end
+
+  # test that xml declaration is retained in output with encoding
+  def test_xml_decl_encoding
+    template = <<-END
+      <?xml version="1.0" encoding="UTF-8" ?>
+      <greeting mv:generate="foo/bar"><hello>World</hello></greeting>
+    END
+    expected = {
+      'foo/bar' => %q{<?xml version="1.0" encoding="UTF-8" ?><greeting><hello>World</hello></greeting>}
+    }
+    assert_template_result expected, template
+  end
+
+  # test that xml declaration is retained in output with encoding and standalone attribute
+  def test_xml_decl_encoding_standalone
+    template = <<-END
+      <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+      <greeting mv:generate="foo/bar"><hello>World</hello></greeting>
+    END
+    expected = {
+      'foo/bar' => %q{<?xml version="1.0" encoding="UTF-8" standalone="yes" ?><greeting><hello>World</hello></greeting>}
+    }
+    assert_template_result expected, template
+  end
+
+  # test that xml declaration is retained in output with encoding
+  def test_xml_doctype_external
+    template = <<-END
+      <?xml version="1.0" encoding="UTF-8" ?>
+      <!DOCTYPE greeting SYSTEM "Hello DTD" "http://foo/hello.dtd">
+      <greeting mv:generate="foo/bar"><hello>World</hello></greeting>
+    END
+    expected = {
+      'foo/bar' => %q{<?xml version="1.0" encoding="UTF-8" ?><!DOCTYPE greeting SYSTEM "Hello DTD" "http://foo/hello.dtd"><greeting><hello>World</hello></greeting>}
+    }
+    assert_template_result expected, template
   end
 
+  # test that xml doctype is retained in output
+  def test_xml_doctype_external_check_newlines
+    template = %Q{<?xml version="1.0" ?>\n<!DOCTYPE greeting SYSTEM "Hello DTD" "hello.dtd">\n<greeting mv:generate="foo/bar"><hello>World</hello></greeting>}
+    expected = {
+      'foo/bar' => %Q{<?xml version="1.0" ?>\n<!DOCTYPE greeting SYSTEM "Hello DTD" "hello.dtd">\n<greeting><hello>World</hello></greeting>}
+    }
+    assert_template_result expected, template, {}, nil, false # lets not normalize whitespace so we can see if newlines are in there
+  end
+
+
   def test_attr
     template = <<-END
       <div mv:generate='foo/bar'>
@@ -93,7 +171,7 @@ class TestTemplate < Test::Unit::TestCase
   def test_block_and_content
     template = <<-END
       <div mv:generate='foo/bar'>
-        <table> 
+        <table>
         <tr mv:block="@products.each do |product|">
           <td>Name:</td><td mv:content="product.name">hello world</td>
         </tr>
@@ -101,7 +179,31 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><table><% @products.each do |product| %><tr><td>Name:</td><td><%= product.name %></td></tr><% end %></table></div>"
+      'foo/bar' => "<div><table><% @products.each do |product| -%><tr><td>Name:</td><td><%= product.name %></td></tr><% end -%></table></div>"
+    }
+    assert_template_result expected, template
+  end
+
+  def test_eval
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <span mv:eval="i = 1">foo bar</span>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div><% i = 1 -%><span>foo bar</span></div>"
+    }
+    assert_template_result expected, template
+  end
+
+  def test_eval_and_if
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <span mv:if="cat == 'blue'" mv:eval="i = 1">foo bar</span>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div><% if( cat == 'blue' ) -%><% i = 1 -%><span>foo bar</span><% end -%></div>"
     }
     assert_template_result expected, template
   end
@@ -115,7 +217,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= form_tag {:action => 'create'}, :method => \"get\" %>hello world <%= end_form_tag %></div>"
+      'foo/bar' => "<div><%= form_tag( { :action => 'create' }, :method => \"get\" ) %>hello world </form></div>"
     }
     assert_template_result expected, template
   end
@@ -127,7 +229,31 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= link_to 'Hello World', :action => 'show', :id => @product %></div>"
+      'foo/bar' => "<div><%= link_to( 'Hello World', :action => 'show', :id => @product ) %></div>"
+    }
+    assert_template_result expected, template
+  end
+
+  def test_link_to_and_if
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <a href="#" mv:if="@product_pages.current.next" mv:link_to=":page => @product_pages.current.next">Hello World</a>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div><% if( @product_pages.current.next ) -%><%= link_to( 'Hello World', :page => @product_pages.current.next ) %><% end -%></div>"
+    }
+    assert_template_result expected, template
+  end
+
+  def test_link_to_merge
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <a href="#" mv:link_to=":action => 'show', :id => @product" class="red">Hello World</a>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div><%= link_to( 'Hello World', { :action => 'show', :id => @product }, :class => \"red\" ) %></div>"
     }
     assert_template_result expected, template
   end
@@ -139,11 +265,60 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= link_to_if @product_pages.current.previous, 'Previous page', {:page => @product_pages.current.previous } %></div>"
+      'foo/bar' => "<div><%= link_to_if( @product_pages.current.previous, 'Previous page', {:page => @product_pages.current.previous } ) %></div>"
+    }
+    assert_template_result expected, template
+  end
+
+  def test_link_to_if_merge
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <a href="#" mv:link_to_if="@product_pages.current.previous, {:page => @product_pages.current.previous } " class="red">Previous page</a>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div><%= link_to_if( @product_pages.current.previous, 'Previous page', {:page => @product_pages.current.previous }, :class => \"red\" ) %></div>"
+    }
+    assert_template_result expected, template
+  end
+
+  def test_link_to_function
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <a href="#" mv:link_to_function="alert('hi there');" id="hw" class="red">Hello World</a>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div><%= link_to_function( 'Hello World', \"alert('hi there');\", :class => \"red\", :id => \"hw\" ) %></div>"
+    }
+    assert_template_result expected, template
+  end
+
+  def test_link_to_function_if_js
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <a href="#" mv:link_to_function="if(true){ alert('hi there'); }" id="hw" class="red">Hello World</a>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div><%= link_to_function( 'Hello World', \"if(true){ alert('hi there'); }\", :class => \"red\", :id => \"hw\" ) %></div>"
     }
     assert_template_result expected, template
   end
 
+  def test_link_to_function_if_js_merged
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <a href="#" mv:link_to_function="'foobarfun()', :id => 'hw'" class="red">Hello World</a>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div><%= link_to_function( 'Hello World', 'foobarfun()', :id => 'hw', :class => \"red\" ) %></div>"
+    }
+    assert_template_result expected, template
+  end
+
+
   def test_submit
     template = <<-END
       <div mv:generate='foo/bar'>
@@ -151,7 +326,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= submit_tag 'Hello World', :foo => 'bar' %></div>"
+      'foo/bar' => "<div><%= submit_tag( 'Hello World', :foo => 'bar' ) %></div>"
     }
     assert_template_result expected, template
   end
@@ -163,7 +338,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= text_field 'product', 'price', :maxlength => 21, :size => 10 %></div>"
+      'foo/bar' => "<div><%= text_field( 'product', 'price', :maxlength => 21, :size => 10 ) %></div>"
     }
     assert_template_result expected, template
   end
@@ -175,7 +350,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= hidden_field 'product', 'price' %></div>"
+      'foo/bar' => "<div><%= hidden_field( 'product', 'price' ) %></div>"
     }
     assert_template_result expected, template
   end
@@ -187,7 +362,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= password_field 'product', 'price', :maxlength => 21, :size => 10 %></div>"
+      'foo/bar' => "<div><%= password_field( 'product', 'price', :maxlength => 21, :size => 10 ) %></div>"
     }
     assert_template_result expected, template
   end
@@ -201,7 +376,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= text_area 'product', 'desc', :class => \"foo\", :cols => 21, :disabled => true, :readonly => true, :rows => 10, :style => \"bar\" %></div>"
+      'foo/bar' => "<div><%= text_area( 'product', 'desc', :class => \"foo\", :cols => 21, :disabled => true, :readonly => true, :rows => 10, :style => \"bar\" ) %></div>"
     }
     assert_template_result expected, template
   end
@@ -224,7 +399,7 @@ class TestTemplate < Test::Unit::TestCase
         <span mv:replace="h product[:price]">foo bar</span>
       </div>
     END
-    expected = { }      
+    expected = { }
     assert_template_result expected, template
   end
 
@@ -301,7 +476,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><% if @hello %><div><% end %><foo>bar</foo><% if @hello %></div><% end %></div>"
+      'foo/bar' => "<div><% if( @hello ) -%><div><% end -%><foo>bar</foo><% if( @hello ) -%></div><% end -%></div>"
     }
     assert_template_result expected, template
   end
@@ -361,10 +536,10 @@ class TestTemplate < Test::Unit::TestCase
 
   # Only simplify elements that are specified in the DTD as being empty, collapsing others can cause parsing
   # or rendering problems in browsers. Uses constant XHTMLEmptyElementNameSet to find elements that should be
-  # collapsed. 
+  # collapsed.
   # http://www.w3.org/TR/xhtml1/dtds.html#a_dtd_XHTML-1.0-Strict
   # xhtml-1.0-Strict empty elements are:
-  # base, meta, link, hr, br, param, img, area, input, col 
+  # base, meta, link, hr, br, param, img, area, input, col
   def test_simplify_empty_elements
     template = <<-END
       <div mv:generate='foo/bar'>
@@ -475,7 +650,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= image_tag 'cat.jpg' %></div>"
+      'foo/bar' => "<div><%= image_tag( 'cat.jpg' ) %></div>"
     }
     assert_template_result expected, template, :template_pathname => 'one/two_three.four'
   end
@@ -487,7 +662,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= image_tag 'cat.jpg' %></div>"
+      'foo/bar' => "<div><%= image_tag( 'cat.jpg' ) %></div>"
     }
     assert_template_result expected, template, :template_pathname => 'one/two_three.four'
   end
@@ -499,7 +674,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= image_tag '/myimages/cat.jpg' %></div>"
+      'foo/bar' => "<div><%= image_tag( '/myimages/cat.jpg' ) %></div>"
     }
     assert_template_result expected, template, :template_pathname => 'one/two_three.four'
   end
@@ -511,7 +686,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= image_tag 'cat.jpg', :size => '20x10' %></div>"
+      'foo/bar' => "<div><%= image_tag( 'cat.jpg', :height => 10, :width => 20 ) %></div>"
     }
     assert_template_result expected, template, :template_pathname => 'one/two_three.four'
   end
@@ -523,7 +698,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= image_tag 'cat.jpg', :height => '10' %></div>"
+      'foo/bar' => "<div><%= image_tag( 'cat.jpg', :height => 10 ) %></div>"
     }
     assert_template_result expected, template, :template_pathname => 'one/two_three.four'
   end
@@ -535,7 +710,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= image_tag 'cat.jpg', :width => '20' %></div>"
+      'foo/bar' => "<div><%= image_tag( 'cat.jpg', :width => 20 ) %></div>"
     }
     assert_template_result expected, template, :template_pathname => 'one/two_three.four'
   end
@@ -547,7 +722,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= image_tag 'cat.jpg', :alt => 'my cat', :size => '20x10' %></div>"
+      'foo/bar' => "<div><%= image_tag( 'cat.jpg', :alt => \"my cat\", :height => 10, :width => 20 ) %></div>"
     }
     assert_template_result expected, template, :template_pathname => 'one/two_three.four'
   end
@@ -559,7 +734,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= image_tag 'cat.jpg', :alt => 'my cat' %></div>"
+      'foo/bar' => "<div><%= image_tag( 'cat.jpg', :alt => \"my cat\" ) %></div>"
     }
     assert_template_result expected, template, :template_pathname => 'one/two_three.four'
   end
@@ -571,7 +746,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= image_tag 'cat.jpg', :alt => 'my cat', :class => 'blue' %></div>"
+      'foo/bar' => "<div><%= image_tag( 'cat.jpg', :alt => \"my cat\", :class => \"blue\" ) %></div>"
     }
     assert_template_result expected, template, :template_pathname => 'one/two_three.four'
   end
@@ -583,7 +758,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= javascript_include_tag 'cat.js' %></div>"
+      'foo/bar' => "<div><%= javascript_include_tag( 'cat.js' ) %></div>"
     }
     assert_template_result expected, template, :template_pathname => 'one/two_three.four'
   end
@@ -595,7 +770,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= javascript_include_tag :defaults %></div>"
+      'foo/bar' => "<div><%= javascript_include_tag( :defaults ) %></div>"
     }
     assert_template_result expected, template, :template_pathname => 'one/two_three.four'
   end
@@ -607,7 +782,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= javascript_include_tag 'cat.js' %></div>"
+      'foo/bar' => "<div><%= javascript_include_tag( 'cat.js' ) %></div>"
     }
     assert_template_result expected, template, :template_pathname => 'one/two_three.four'
   end
@@ -619,7 +794,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= javascript_include_tag '/myjavascripts/cat.js' %></div>"
+      'foo/bar' => "<div><%= javascript_include_tag( '/myjavascripts/cat.js' ) %></div>"
     }
     assert_template_result expected, template, :template_pathname => 'one/two_three.four'
   end
@@ -631,7 +806,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= check_box 'cat', 'dog', {:egg => 'chicken'}, 'yes', 'no' %></div>"
+      'foo/bar' => "<div><%= check_box( 'cat', 'dog', {:egg => 'chicken'}, 'yes', 'no' ) %></div>"
     }
     assert_template_result expected, template, :template_pathname => 'one/two_three.four'
   end
@@ -643,7 +818,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= check_box 'cat', 'dog' %></div>"
+      'foo/bar' => "<div><%= check_box( 'cat', 'dog' ) %></div>"
     }
     assert_template_result expected, template, :template_pathname => 'one/two_three.four'
   end
@@ -655,7 +830,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= check_box 'cat', 'dog', :egg => 'chicken' %></div>"
+      'foo/bar' => "<div><%= check_box( 'cat', 'dog', :egg => 'chicken' ) %></div>"
     }
     assert_template_result expected, template, :template_pathname => 'one/two_three.four'
   end
@@ -667,7 +842,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= check_box 'cat', 'dog', :class => \"green\", :id => \"boo\" %></div>"
+      'foo/bar' => "<div><%= check_box( 'cat', 'dog', :class => \"green\", :id => \"boo\" ) %></div>"
     }
     assert_template_result expected, template, :template_pathname => 'one/two_three.four'
   end
@@ -679,7 +854,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= check_box 'cat', 'dog', :hello => 'world', :class => \"green\", :id => \"boo\" %></div>"
+      'foo/bar' => "<div><%= check_box( 'cat', 'dog', :hello => 'world', :class => \"green\", :id => \"boo\" ) %></div>"
     }
     assert_template_result expected, template, :template_pathname => 'one/two_three.four'
   end
@@ -691,7 +866,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= radio_button 'cat', 'dog', 'egg' %></div>"
+      'foo/bar' => "<div><%= radio_button( 'cat', 'dog', 'egg' ) %></div>"
     }
     assert_template_result expected, template, :template_pathname => 'one/two_three.four'
   end
@@ -703,7 +878,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= radio_button 'cat', 'dog', 'egg' %></div>"
+      'foo/bar' => "<div><%= radio_button( 'cat', 'dog', 'egg' ) %></div>"
     }
     assert_template_result expected, template, :template_pathname => 'one/two_three.four'
   end
@@ -715,7 +890,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= radio_button 'cat', 'dog', 'egg', :class => \"green\", :id => \"boo\" %></div>"
+      'foo/bar' => "<div><%= radio_button( 'cat', 'dog', 'egg', :class => \"green\", :id => \"boo\" ) %></div>"
     }
     assert_template_result expected, template, :template_pathname => 'one/two_three.four'
   end
@@ -727,7 +902,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= radio_button 'cat', 'dog', 'egg', :hello => 'world', :class => \"green\", :id => \"boo\" %></div>"
+      'foo/bar' => "<div><%= radio_button( 'cat', 'dog', 'egg', :hello => 'world', :class => \"green\", :id => \"boo\" ) %></div>"
     }
     assert_template_result expected, template, :template_pathname => 'one/two_three.four'
   end
@@ -742,7 +917,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= select 'product', 'category_id', ['hardware', 'software'], {:hello => 'world'}, :readonly => true %></div>"
+      'foo/bar' => "<div><%= select( 'product', 'category_id', ['hardware', 'software'], {:hello => 'world'}, :readonly => true ) %></div>"
     }
     assert_template_result expected, template, :template_pathname => 'one/two_three.four'
   end
@@ -757,7 +932,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= select 'product', 'category_id', ['hardware', 'software'] %></div>"
+      'foo/bar' => "<div><%= select( 'product', 'category_id', ['hardware', 'software'] ) %></div>"
     }
     assert_template_result expected, template, :template_pathname => 'one/two_three.four'
   end
@@ -772,7 +947,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= select 'product', 'category_id', Categories.find_all.collect{|c| [c.name, c.id]} %></div>"
+      'foo/bar' => "<div><%= select( 'product', 'category_id', Categories.find_all.collect{|c| [c.name, c.id]} ) %></div>"
     }
     assert_template_result expected, template, :template_pathname => 'one/two_three.four'
   end
@@ -787,7 +962,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= select 'product', 'category_id', Categories.find_all.collect{|c| [c.name, c.id]}, {:hello => :world}, :readonly => true, :class => \"green\", :id => \"sel1\" %></div>"
+      'foo/bar' => "<div><%= select( 'product', 'category_id', Categories.find_all.collect{|c| [c.name, c.id]}, {:hello => :world}, :readonly => true, :class => \"green\", :id => \"sel1\" ) %></div>"
     }
     assert_template_result expected, template, :template_pathname => 'one/two_three.four'
   end
@@ -802,7 +977,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= collection_select 'product', 'category_id', Category.find(:all), 'id', 'name', {:hello => 'world'}, :readonly => true %></div>"
+      'foo/bar' => "<div><%= collection_select( 'product', 'category_id', Category.find(:all), 'id', 'name', {:hello => 'world'}, :readonly => true ) %></div>"
     }
     assert_template_result expected, template, :template_pathname => 'one/two_three.four'
   end
@@ -817,7 +992,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= collection_select 'product', 'category_id', Category.find(:all), 'id', 'name' %></div>"
+      'foo/bar' => "<div><%= collection_select( 'product', 'category_id', Category.find(:all), 'id', 'name' ) %></div>"
     }
     assert_template_result expected, template, :template_pathname => 'one/two_three.four'
   end
@@ -832,7 +1007,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= collection_select 'product', 'category_id', Category.find(:all), :id, :name, {:hello => 'world'}, :readonly => true %></div>"
+      'foo/bar' => "<div><%= collection_select( 'product', 'category_id', Category.find(:all), :id, :name, {:hello => 'world'}, :readonly => true ) %></div>"
     }
     assert_template_result expected, template, :template_pathname => 'one/two_three.four'
   end
@@ -847,7 +1022,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= collection_select 'product', 'category_id', Category.find(:all), 'id', 'name', {:hello => 'world'}, :readonly => true, :class => \"green\", :id => \"sel1\" %></div>"
+      'foo/bar' => "<div><%= collection_select( 'product', 'category_id', Category.find(:all), 'id', 'name', {:hello => 'world'}, :readonly => true, :class => \"green\", :id => \"sel1\" ) %></div>"
     }
     assert_template_result expected, template, :template_pathname => 'one/two_three.four'
   end
@@ -862,7 +1037,7 @@ class TestTemplate < Test::Unit::TestCase
       </div>
     END
     expected = {
-      'foo/bar' => "<div><%= collection_select 'product', 'category_id', Category.find(:all), 'id', 'name', {}, :class => \"green\", :id => \"sel1\" %></div>"
+      'foo/bar' => "<div><%= collection_select( 'product', 'category_id', Category.find(:all), 'id', 'name', {}, :class => \"green\", :id => \"sel1\" ) %></div>"
     }
     assert_template_result expected, template, :template_pathname => 'one/two_three.four'
   end