Merge pull request #641 from nathanscott/master

label => false on timish not html_safe > fixed
formtastic · Jul 31, 2011 · 4202457 · 4202457
2 parents 18639a1 + 0acfe94
commit 4202457
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/formtastic/inputs/base/timeish.rb b/lib/formtastic/inputs/base/timeish.rb
@@ -196,7 +196,7 @@ def fragments_label
               :class => "label"
             )
           else
-            ""
+            "".html_safe
           end
         end
 

diff --git a/spec/inputs/label_spec.rb b/spec/inputs/label_spec.rb
@@ -73,6 +73,14 @@
       output_buffer.should_not have_tag('label')
       output_buffer.should_not include("&gt;")
     end
+
+    it 'should return nil if label is false for timeish fragments' do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :time, :label => false)
+      end)
+      output_buffer.should_not have_tag('li.time > label')
+      output_buffer.should_not include("&gt;")
+    end
 
     it 'should html escape the label string by default' do
       concat(semantic_form_for(@new_post) do |builder|