0
@@ -26,7 +26,7 @@ module Merb
0
       #   # <div class="class">content</div>
0
       # 
0
       def tag(name, contents = nil, attrs = {}, &block)
0
-        attrs = contents if contents.is_a?(Hash)
0
+        attrs, contents = contents, nil if contents.is_a?(Hash)
0
         contents = capture(&block) if block_given?
0
         open_tag(name, attrs) + contents.to_s + close_tag(name)
0
       end

0
@@ -4,8 +4,55 @@ Merb::Plugins.config[:helpers] = {
0
   :form_class => Merb::CompleteFormWithErrors
0
 }
0
 
0
+describe "tag" do
0
+  it_should_behave_like "FakeController"
0
+ 
0
+  it %{tag(:div)} do
0
+    tag(:div).should == %{<div></div>}
0
+  end
0
+ 
0
+  it %{tag(:div, 'content')} do
0
+    tag(:div, 'content').should == %{<div>content</div>}
0
+  end
0
+ 
0
+  it %{tag(:div, :class => "math")} do
0
+    tag(:div, :class => "math").should == %{<div class="math"></div>}
0
+  end
0
+ 
0
+  it %{tag(:div, :id => "head")} do
0
+    tag(:div, :id => "head").should == %{<div id="head"></div>}
0
+  end
0
+ 
0
+  it %{tag(:div, 'content', :class => "math")} do
0
+    tag(:div, 'content', :class => "math").should ==
0
+      %{<div class="math">content</div>}
0
+  end
0
+ 
0
+  it %{tag(:div) { 'content' }} do
0
+    o = tag(:div) do
0
+      _buffer << 'content'
0
+    end
0
+    o.should == %{<div>content</div>}
0
+  end
0
+ 
0
+  it %{tag(:div, :class => "math") { 'content' }} do
0
+    o = tag(:div, :class => "math") do
0
+      _buffer << 'content'
0
+    end
0
+    o.should == %{<div class="math">content</div>}
0
+  end
0
+ 
0
+  it %{tag(:div, :id => "head") { 'content' }} do
0
+    o = tag(:div, :id => "head") do
0
+      _buffer << 'content'
0
+    end
0
+    o.should == %{<div id="head">content</div>}
0
+  end
0
+  
0
+end
0
+
0
 describe "error_messages_for" do
0
-  it_should_behave_like "FakeController"  
0
+  it_should_behave_like "FakeController"
0
   
0
   before :each do
0
     @dm_obj = Object.new