formtastic 2.0.2 → 2.1.0.beta1

data/spec/helpers/actions_helper_spec.rb

@@ -0,0 +1,143 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe 'Formtastic::FormBuilder#actions' do
+
+  include FormtasticSpecHelper
+
+  before do
+    @output_buffer = ''
+    mock_everything
+  end
+
+  describe 'with a block' do
+    describe 'when no options are provided' do
+      before do
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.actions do
+            concat('hello')
+          end)
+        end)
+      end
+
+      it 'should render a fieldset inside the form, with a class of "actions"' do
+        output_buffer.should have_tag("form fieldset.actions")
+      end
+
+      it 'should render an ol inside the fieldset' do
+        output_buffer.should have_tag("form fieldset.actions ol")
+      end
+
+      it 'should render the contents of the block inside the ol' do
+        output_buffer.should have_tag("form fieldset.actions ol", /hello/)
+      end
+
+      it 'should not render a legend inside the fieldset' do
+        output_buffer.should_not have_tag("form fieldset.actions legend")
+      end
+    end
+
+    describe 'when a :name option is provided' do
+      before do
+        @legend_text = "Advanced options"
+    
+        concat(semantic_form_for(@new_post) do |builder|
+          builder.actions :name => @legend_text do
+          end
+        end)
+      end
+      it 'should render a fieldset inside the form' do
+        output_buffer.should have_tag("form fieldset.actions legend", /#{@legend_text}/)
+      end
+    end
+    
+    describe 'when other options are provided' do
+      before do
+        @id_option = 'advanced'
+        @class_option = 'wide'
+    
+        concat(semantic_form_for(@new_post) do |builder|
+          builder.actions :id => @id_option, :class => @class_option do
+          end
+        end)
+      end
+      it 'should pass the options into the fieldset tag as attributes' do
+        output_buffer.should have_tag("form fieldset##{@id_option}")
+        output_buffer.should have_tag("form fieldset.#{@class_option}")
+      end
+    end
+    
+  end
+
+  describe 'without a block' do
+  
+    describe 'with no args (default buttons)' do
+  
+      before do
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.actions)
+        end)
+      end
+  
+      it 'should render a form' do
+        output_buffer.should have_tag('form')
+      end
+  
+      it 'should render an actions fieldset inside the form' do
+        output_buffer.should have_tag('form fieldset.actions')
+      end
+  
+      it 'should not render a legend in the fieldset' do
+        output_buffer.should_not have_tag('form fieldset.actions legend')
+      end
+  
+      it 'should render an ol in the fieldset' do
+        output_buffer.should have_tag('form fieldset.actions ol')
+      end
+  
+      it 'should render a list item in the ol for each default action' do
+        output_buffer.should have_tag('form fieldset.actions ol li.action.input_action', :count => 1)
+      end
+  
+    end
+  
+    describe 'with button names as args' do
+    
+      before do
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.actions(:submit, :cancel, :reset))
+        end)
+      end
+    
+      it 'should render a form with a fieldset containing a list item for each button arg' do
+        output_buffer.should have_tag('form > fieldset.actions > ol > li.action', :count => 3)
+      end
+    
+    end
+  
+    describe 'with button names as args and an options hash' do
+    
+     before do
+       concat(semantic_form_for(@new_post) do |builder|
+         concat(builder.actions(:submit, :cancel, :reset, :name => "Now click a button", :id => "my-id"))
+       end)
+     end
+    
+     it 'should render a form with a fieldset containing a list item for each button arg' do
+       output_buffer.should have_tag('form > fieldset.actions > ol > li.action', :count => 3)
+     end
+    
+     it 'should pass the options down to the fieldset' do
+       output_buffer.should have_tag('form > fieldset#my-id.actions')
+     end
+    
+     it 'should use the special :name option as a text for the legend tag' do
+       output_buffer.should have_tag('form > fieldset#my-id.actions > legend', /Now click a button/)
+     end
+    
+    end
+  
+  end
+  
+end
+

data/spec/helpers/buttons_helper_spec.rb

@@ -13,12 +13,14 @@ describe 'Formtastic::FormBuilder#buttons' do
   describe 'with a block' do
     describe 'when no options are provided' do
       before do
-        concat(semantic_form_for(@new_post) do |builder|
-          buttons = builder.buttons do
-            concat('hello')
-          end
-          concat(buttons)
-        end)
+        with_deprecation_silenced do
+          concat(semantic_form_for(@new_post) do |builder|
+            buttons = builder.buttons do
+              concat('hello')
+            end
+            concat(buttons)
+          end)
+        end
       end
 
       it 'should render a fieldset inside the form, with a class of "inputs"' do
@@ -42,14 +44,18 @@ describe 'Formtastic::FormBuilder#buttons' do
       before do
         @legend_text = "Advanced options"
 
-        concat(semantic_form_for(@new_post) do |builder|
-          builder.buttons :name => @legend_text do
-          end
-        end)
+        with_deprecation_silenced do
+          concat(semantic_form_for(@new_post) do |builder|
+            builder.buttons :name => @legend_text do
+            end
+          end)
+        end
       end
+      
       it 'should render a fieldset inside the form' do
         output_buffer.should have_tag("form fieldset legend", /#{@legend_text}/)
       end
+
     end
 
     describe 'when other options are provided' do
@@ -57,15 +63,19 @@ describe 'Formtastic::FormBuilder#buttons' do
         @id_option = 'advanced'
         @class_option = 'wide'
 
-        concat(semantic_form_for(@new_post) do |builder|
-          builder.buttons :id => @id_option, :class => @class_option do
-          end
-        end)
+        with_deprecation_silenced do
+          concat(semantic_form_for(@new_post) do |builder|
+            builder.buttons :id => @id_option, :class => @class_option do
+            end
+          end)
+        end
       end
+      
       it 'should pass the options into the fieldset tag as attributes' do
         output_buffer.should have_tag("form fieldset##{@id_option}")
         output_buffer.should have_tag("form fieldset.#{@class_option}")
       end
+
     end
 
   end
@@ -75,9 +85,11 @@ describe 'Formtastic::FormBuilder#buttons' do
     describe 'with no args (default buttons)' do
 
       before do
-        concat(semantic_form_for(@new_post) do |builder|
-          concat(builder.buttons)
-        end)
+        with_deprecation_silenced do
+          concat(semantic_form_for(@new_post) do |builder|
+            concat(builder.buttons)
+          end)
+        end
       end
 
       it 'should render a form' do
@@ -109,9 +121,11 @@ describe 'Formtastic::FormBuilder#buttons' do
     describe 'with button names as args' do
 
       before do
-        concat(semantic_form_for(@new_post) do |builder|
-          concat(builder.buttons(:commit))
-        end)
+        with_deprecation_silenced do
+          concat(semantic_form_for(@new_post) do |builder|
+            concat(builder.buttons(:commit))
+          end)
+        end
       end
 
       it 'should render a form with a fieldset containing a list item for each button arg' do
@@ -124,9 +138,11 @@ describe 'Formtastic::FormBuilder#buttons' do
     describe 'with button names as args and an options hash' do
 
       before do
-        concat(semantic_form_for(@new_post) do |builder|
-          concat(builder.buttons(:commit, :name => "Now click a button", :id => "my-id"))
-        end)
+        with_deprecation_silenced do
+          concat(semantic_form_for(@new_post) do |builder|
+            concat(builder.buttons(:commit, :name => "Now click a button", :id => "my-id"))
+          end)
+        end
       end
 
       it 'should render a form with a fieldset containing a list item for each button arg' do

data/spec/helpers/commit_button_helper_spec.rb

@@ -9,7 +9,7 @@ describe 'Formtastic::FormBuilder#commit_button' do
     @output_buffer = ''
     mock_everything
   end
-
+  
   describe 'when the object responds to :persisted? (ActiveModel)' do
 
     before do
@@ -19,17 +19,19 @@ describe 'Formtastic::FormBuilder#commit_button' do
     end
 
     it 'should call :persisted?' do
-      with_config :i18n_lookups_by_default, false do
-        @new_post.should_receive(:persisted?)
-        @new_post.should_not_receive(:new_record?)
-        semantic_form_for(@new_post) do |builder|
-          concat(builder.commit_button)
+      with_deprecation_silenced do
+        with_config :i18n_lookups_by_default, false do
+          @new_post.should_receive(:persisted?)
+          @new_post.should_not_receive(:new_record?)
+          semantic_form_for(@new_post) do |builder|
+            concat(builder.commit_button)
+          end
         end
       end
     end
 
   end
-  
+
   describe 'when not persisted' do
 
     before do
@@ -39,30 +41,33 @@ describe 'Formtastic::FormBuilder#commit_button' do
     end
 
     it 'should have a submit button label' do
-      with_config :i18n_lookups_by_default, false do
-        concat(semantic_form_for(@new_post) do |builder|
-          concat(builder.commit_button)
-        end)
+      with_deprecation_silenced do
+        with_config :i18n_lookups_by_default, false do
+          concat(semantic_form_for(@new_post) do |builder|
+            concat(builder.commit_button)
+          end)
+        end
       end
-      
+
       output_buffer.should have_tag('.commit input[@value="Submit Post"]')
     end
   end
-  
-  
+
   describe 'when used on any record' do
 
     before do
       @new_post.stub!(:new_record?).and_return(false)
-      concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.commit_button)
-      end)
+      with_deprecation_silenced do
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.commit_button)
+        end)
+      end
     end
 
     it 'should render a commit li' do
       output_buffer.should have_tag('li.commit')
     end
-    
+
     it 'should render a button li' do
       output_buffer.should have_tag('li.button')
     end
@@ -77,9 +82,11 @@ describe 'Formtastic::FormBuilder#commit_button' do
 
     it 'should pass options given in :button_html to the button' do
       @new_post.stub!(:new_record?).and_return(false)
-      concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.commit_button('text', :button_html => {:class => 'my_class', :id => 'my_id'}))
-      end)
+      with_deprecation_silenced do
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.commit_button('text', :button_html => {:class => 'my_class', :id => 'my_id'}))
+        end)
+      end
 
       output_buffer.should have_tag('li.commit input#my_id')
       output_buffer.should have_tag('li.commit input.my_class')
@@ -98,9 +105,11 @@ describe 'Formtastic::FormBuilder#commit_button' do
     it 'should use the default if set' do
       with_config :default_commit_button_accesskey, 's' do
         @new_post.stub!(:new_record?).and_return(false)
-        concat(semantic_form_for(@new_post) do |builder|
-          concat(builder.commit_button('text', :button_html => {}))
-        end)
+        with_deprecation_silenced do
+          concat(semantic_form_for(@new_post) do |builder|
+            concat(builder.commit_button('text', :button_html => {}))
+          end)
+        end
         output_buffer.should have_tag('li.commit input[@accesskey="s"]')
       end
     end
@@ -108,9 +117,11 @@ describe 'Formtastic::FormBuilder#commit_button' do
     it 'should use the value set in options over the default' do
       with_config :default_commit_button_accesskey, 's' do
         @new_post.stub!(:new_record?).and_return(false)
-        concat(semantic_form_for(@new_post) do |builder|
-          concat(builder.commit_button('text', :accesskey => 'o'))
-        end)
+        with_deprecation_silenced do
+          concat(semantic_form_for(@new_post) do |builder|
+            concat(builder.commit_button('text', :accesskey => 'o'))
+          end)
+        end
         output_buffer.should_not have_tag('li.commit input[@accesskey="s"]')
         output_buffer.should have_tag('li.commit input[@accesskey="o"]')
       end
@@ -119,9 +130,11 @@ describe 'Formtastic::FormBuilder#commit_button' do
     it 'should use the value set in button_html over options' do
       with_config :default_commit_button_accesskey, 's' do
         @new_post.stub!(:new_record?).and_return(false)
-        concat(semantic_form_for(@new_post) do |builder|
-          concat(builder.commit_button('text', :accesskey => 'o', :button_html => {:accesskey => 't'}))
-        end)
+        with_deprecation_silenced do
+          concat(semantic_form_for(@new_post) do |builder|
+            concat(builder.commit_button('text', :accesskey => 'o', :button_html => {:accesskey => 't'}))
+          end)
+        end
         output_buffer.should_not have_tag('li.commit input[@accesskey="s"]')
         output_buffer.should_not have_tag('li.commit input[@accesskey="o"]')
         output_buffer.should have_tag('li.commit input[@accesskey="t"]')
@@ -134,9 +147,11 @@ describe 'Formtastic::FormBuilder#commit_button' do
 
     before do
       @new_post.stub!(:new_record?).and_return(false)
-      concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.commit_button("a string", :button_html => { :class => "pretty"}))
-      end)
+      with_deprecation_silenced do
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.commit_button("a string", :button_html => { :class => "pretty"}))
+        end)
+      end
     end
 
     it "should render the string as the value of the button" do
@@ -153,9 +168,11 @@ describe 'Formtastic::FormBuilder#commit_button' do
 
     before do
       @new_post.stub!(:new_record?).and_return(false)
-      concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.commit_button(:button_html => { :class => "pretty"}))
-      end)
+      with_deprecation_silenced do
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.commit_button(:button_html => { :class => "pretty"}))
+        end)
+      end
     end
 
     it "should deal with the options hash" do
@@ -170,9 +187,11 @@ describe 'Formtastic::FormBuilder#commit_button' do
     describe 'when used without object' do
       describe 'when explicit label is provided' do
         it 'should render an input with the explicitly specified label' do
-          concat(semantic_form_for(:post, :url => 'http://example.com') do |builder|
-            concat(builder.commit_button("Click!"))
-          end)
+          with_deprecation_silenced do
+            concat(semantic_form_for(:post, :url => 'http://example.com') do |builder|
+              concat(builder.commit_button("Click!"))
+            end)
+          end
           output_buffer.should have_tag('li.commit input[@value="Click!"][@class~="submit"]')
         end
       end
@@ -188,9 +207,11 @@ describe 'Formtastic::FormBuilder#commit_button' do
           end
 
           it 'should render an input with default I18n-localized label (fallback)' do
-            concat(semantic_form_for(:post, :url => 'http://example.com') do |builder|
-              concat(builder.commit_button)
-            end)
+            with_deprecation_silenced do
+              concat(semantic_form_for(:post, :url => 'http://example.com') do |builder|
+                concat(builder.commit_button)
+              end)
+            end
             output_buffer.should have_tag('li.commit input[@value="Submit Post"][@class~="submit"]')
           end
         end
@@ -204,11 +225,11 @@ describe 'Formtastic::FormBuilder#commit_button' do
                   }
                }
          end
-         
+
          after do
            ::I18n.backend.reload!
          end
-         
+
          it 'should render an input with localized label (I18n)' do
            with_config :i18n_lookups_by_default, true do
              ::I18n.backend.store_translations :en,
@@ -219,18 +240,22 @@ describe 'Formtastic::FormBuilder#commit_button' do
                       }
                     }
                  }
-             concat(semantic_form_for(:post, :url => 'http://example.com') do |builder|
-               concat(builder.commit_button)
-             end)
+             with_deprecation_silenced do
+               concat(semantic_form_for(:post, :url => 'http://example.com') do |builder|
+                 concat(builder.commit_button)
+               end)
+             end
              output_buffer.should have_tag(%Q{li.commit input[@value="Custom Submit Post"][@class~="submit"]})
            end
          end
-         
+
          it 'should render an input with anoptional localized label (I18n) - if first is not set' do
            with_config :i18n_lookups_by_default, true do
-             concat(semantic_form_for(:post, :url => 'http://example.com') do |builder|
-               concat(builder.commit_button)
-             end)
+             with_deprecation_silenced do
+               concat(semantic_form_for(:post, :url => 'http://example.com') do |builder|
+                 concat(builder.commit_button)
+               end)
+             end
              output_buffer.should have_tag(%Q{li.commit input[@value="Custom Submit"][@class~="submit"]})
            end
          end
@@ -247,9 +272,11 @@ describe 'Formtastic::FormBuilder#commit_button' do
 
       describe 'when explicit label is provided' do
         it 'should render an input with the explicitly specified label' do
-          concat(semantic_form_for(@new_post) do |builder|
-            concat(builder.commit_button("Click!"))
-          end)
+          with_deprecation_silenced do
+            concat(semantic_form_for(@new_post) do |builder|
+              concat(builder.commit_button("Click!"))
+            end)
+          end
           output_buffer.should have_tag('li.commit input[@value="Click!"][@class~="create"]')
         end
       end
@@ -265,9 +292,11 @@ describe 'Formtastic::FormBuilder#commit_button' do
           end
 
           it 'should render an input with default I18n-localized label (fallback)' do
-            concat(semantic_form_for(@new_post) do |builder|
-              concat(builder.commit_button)
-            end)
+            with_deprecation_silenced do
+              concat(semantic_form_for(@new_post) do |builder|
+                concat(builder.commit_button)
+              end)
+            end
             output_buffer.should have_tag('li.commit input[@value="Create Post"][@class~="create"]')
           end
         end
@@ -296,18 +325,22 @@ describe 'Formtastic::FormBuilder#commit_button' do
                        }
                      }
                   }
-              concat(semantic_form_for(@new_post) do |builder|
-                concat(builder.commit_button)
-              end)
+              with_deprecation_silenced do
+                concat(semantic_form_for(@new_post) do |builder|
+                  concat(builder.commit_button)
+                end)
+              end
               output_buffer.should have_tag(%Q{li.commit input[@value="Custom Create Post"][@class~="create"]})
             end
           end
 
           it 'should render an input with anoptional localized label (I18n) - if first is not set' do
             with_config :i18n_lookups_by_default, true do
-              concat(semantic_form_for(@new_post) do |builder|
-                concat(builder.commit_button)
-              end)
+              with_deprecation_silenced do
+                concat(semantic_form_for(@new_post) do |builder|
+                  concat(builder.commit_button)
+                end)
+              end
               output_buffer.should have_tag(%Q{li.commit input[@value="Custom Create"][@class~="create"]})
             end
           end
@@ -324,9 +357,11 @@ describe 'Formtastic::FormBuilder#commit_button' do
 
       describe 'when explicit label is provided' do
         it 'should render an input with the explicitly specified label' do
-          concat(semantic_form_for(@new_post) do |builder|
-            concat(builder.commit_button("Click!"))
-          end)
+          with_deprecation_silenced do
+            concat(semantic_form_for(@new_post) do |builder|
+              concat(builder.commit_button("Click!"))
+            end)
+          end
           output_buffer.should have_tag('li.commit input[@value="Click!"][@class~="update"]')
         end
       end
@@ -342,9 +377,11 @@ describe 'Formtastic::FormBuilder#commit_button' do
           end
 
           it 'should render an input with default I18n-localized label (fallback)' do
-            concat(semantic_form_for(@new_post) do |builder|
-              concat(builder.commit_button)
-            end)
+            with_deprecation_silenced do
+              concat(semantic_form_for(@new_post) do |builder|
+                concat(builder.commit_button)
+              end)
+            end
             output_buffer.should have_tag('li.commit input[@value="Save Post"][@class~="update"]')
           end
         end
@@ -374,18 +411,22 @@ describe 'Formtastic::FormBuilder#commit_button' do
                        }
                      }
                   }
-              concat(semantic_form_for(@new_post) do |builder|
-                concat(builder.commit_button)
-              end)
+              with_deprecation_silenced do
+                concat(semantic_form_for(@new_post) do |builder|
+                  concat(builder.commit_button)
+                end)
+              end
               output_buffer.should have_tag(%Q{li.commit input[@value="Custom Save Post"][@class~="update"]})
             end
           end
 
           it 'should render an input with anoptional localized label (I18n) - if first is not set' do
             with_config :i18n_lookups_by_default, true do
-              concat(semantic_form_for(@new_post) do |builder|
-                concat(builder.commit_button)
-              end)
+              with_deprecation_silenced do
+                concat(semantic_form_for(@new_post) do |builder|
+                  concat(builder.commit_button)
+                end)
+              end
               output_buffer.should have_tag(%Q{li.commit input[@value="Custom Save"][@class~="update"]})
               ::I18n.backend.store_translations :en, :formtastic => {}
             end
@@ -417,9 +458,11 @@ describe 'Formtastic::FormBuilder#commit_button' do
       @new_user_post = ::UserPost.new
 
       @new_user_post.stub!(:new_record?).and_return(true)
-      concat(semantic_form_for(@new_user_post, :url => '') do |builder|
-        concat(builder.commit_button())
-      end)
+      with_deprecation_silenced do
+        concat(semantic_form_for(@new_user_post, :url => '') do |builder|
+          concat(builder.commit_button())
+        end)
+      end
     end
 
     it "should render the string as the value of the button" do
@@ -427,29 +470,35 @@ describe 'Formtastic::FormBuilder#commit_button' do
     end
 
   end
-  
+
   describe ':wrapper_html option' do
 
     describe 'when provided' do
       it 'should be passed down to the li tag' do
-        concat(semantic_form_for(@new_post) do |builder|
-          concat(builder.commit_button('text', :wrapper_html => {:id => :another_id}))
-        end)
+        with_deprecation_silenced do
+          concat(semantic_form_for(@new_post) do |builder|
+            concat(builder.commit_button('text', :wrapper_html => {:id => :another_id}))
+          end)
+        end
         output_buffer.should have_tag("form li#another_id")
       end
 
       it 'should append given classes to li default classes' do
-        concat(semantic_form_for(@new_post) do |builder|
-          concat(builder.commit_button('text', :wrapper_html => {:class => :another_class}))
-        end)
+        with_deprecation_silenced do 
+          concat(semantic_form_for(@new_post) do |builder|
+            concat(builder.commit_button('text', :wrapper_html => {:class => :another_class}))
+          end)
+        end
         output_buffer.should have_tag("form li.commit")
         output_buffer.should have_tag("form li.another_class")
       end
 
       it 'should allow classes to be an array' do
-        concat(semantic_form_for(@new_post) do |builder|
-          concat(builder.commit_button('text', :wrapper_html => {:class => [ :my_class, :another_class ]}))
-        end)
+        with_deprecation_silenced do 
+          concat(semantic_form_for(@new_post) do |builder|
+            concat(builder.commit_button('text', :wrapper_html => {:class => [ :my_class, :another_class ]}))
+          end)
+        end
         output_buffer.should have_tag("form li.commit")
         output_buffer.should have_tag("form li.my_class")
         output_buffer.should have_tag("form li.another_class")
@@ -457,14 +506,25 @@ describe 'Formtastic::FormBuilder#commit_button' do
     end
 
     describe 'when not provided' do
-      it 'should use default id and class' do
-        concat(semantic_form_for(@new_post) do |builder|
-          concat(builder.commit_button('text'))
-        end)
+      it 'should use default class' do
+        with_deprecation_silenced do 
+          concat(semantic_form_for(@new_post) do |builder|
+            concat(builder.commit_button('text'))
+          end)
+        end
         output_buffer.should have_tag("form li.commit.button")
       end
+
+      it 'should use default id' do
+        with_deprecation_silenced do 
+          concat(semantic_form_for(@new_post) do |builder|
+            concat(builder.commit_button('text'))
+          end)
+        end
+        output_buffer.should have_tag("form li.commit.button input#post_submit")
+      end
     end
 
   end
-  
+
 end