formtastic 2.3.0.rc2 → 2.3.0.rc3

data/spec/helpers/inputs_helper_spec.rb

@@ -56,13 +56,13 @@ describe 'Formtastic::FormBuilder#inputs' do
     describe 'when a :for option is provided' do
   
       before do
-        @new_post.stub!(:respond_to?).and_return(true, true)
-        @new_post.stub!(:respond_to?).with(:empty?).and_return(false)
-        @new_post.stub!(:author).and_return(@bob)
+        @new_post.stub(:respond_to?).and_return(true, true)
+        @new_post.stub(:respond_to?).with(:empty?).and_return(false)
+        @new_post.stub(:author).and_return(@bob)
       end
   
       it 'should render nested inputs' do
-        @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
+        @bob.stub(:column_for_attribute).and_return(double('column', :type => :string, :limit => 255))
   
         concat(semantic_form_for(@new_post) do |builder|
           inputs = builder.inputs :for => [:author, @bob] do |bob_builder|
@@ -75,7 +75,7 @@ describe 'Formtastic::FormBuilder#inputs' do
       end
   
       it 'should concat rendered nested inputs to the template' do
-        @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
+        @bob.stub(:column_for_attribute).and_return(double('column', :type => :string, :limit => 255))
   
         concat(semantic_form_for(@new_post) do |builder|
           builder.inputs :for => [:author, @bob] do |bob_builder|
@@ -104,8 +104,8 @@ describe 'Formtastic::FormBuilder#inputs' do
   
       describe "as a symbol representing a has_many association name" do
         before do
-          @new_post.stub!(:authors).and_return([@bob, @fred])
-          @new_post.stub!(:authors_attributes=)
+          @new_post.stub(:authors).and_return([@bob, @fred])
+          @new_post.stub(:authors_attributes=)
         end
   
         it 'should nest the inputs with a fieldset, legend and :name input for each item' do
@@ -177,7 +177,7 @@ describe 'Formtastic::FormBuilder#inputs' do
       end
   
       it 'should pass options down to semantic_fields_for' do
-        @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
+        @bob.stub(:column_for_attribute).and_return(double('column', :type => :string, :limit => 255))
   
         concat(semantic_form_for(@new_post) do |builder|
           inputs = builder.inputs :for => [:author, @bob], :for_options => { :index => 10 } do |bob_builder|
@@ -341,17 +341,17 @@ describe 'Formtastic::FormBuilder#inputs' do
   describe 'without a block' do
   
     before do
-      ::Post.stub!(:reflections).and_return({:author => mock('reflection', :options => {}, :macro => :belongs_to),
-                                           :comments => mock('reflection', :options => {}, :macro => :has_many) })
+      ::Post.stub(:reflections).and_return({:author => double('reflection', :options => {}, :macro => :belongs_to),
+                                           :comments => double('reflection', :options => {}, :macro => :has_many) })
   
-      @new_post.stub!(:title)
-      @new_post.stub!(:body)
-      @new_post.stub!(:author_id)
+      @new_post.stub(:title)
+      @new_post.stub(:body)
+      @new_post.stub(:author_id)
   
-      @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :string, :limit => 255))
-      @new_post.stub!(:column_for_attribute).with(:body).and_return(mock('column', :type => :text))
-      @new_post.stub!(:column_for_attribute).with(:created_at).and_return(mock('column', :type => :datetime))
-      @new_post.stub!(:column_for_attribute).with(:author).and_return(nil)
+      @new_post.stub(:column_for_attribute).with(:title).and_return(double('column', :type => :string, :limit => 255))
+      @new_post.stub(:column_for_attribute).with(:body).and_return(double('column', :type => :text))
+      @new_post.stub(:column_for_attribute).with(:created_at).and_return(double('column', :type => :datetime))
+      @new_post.stub(:column_for_attribute).with(:author).and_return(nil)
     end
   
     describe 'with no args (quick forms syntax)' do
@@ -402,12 +402,12 @@ describe 'Formtastic::FormBuilder#inputs' do
       context "with a polymorphic association" do
         
         before do 
-          @new_post.stub!(:commentable)
-          @new_post.class.stub!(:reflections).and_return({ 
-            :commentable => mock('macro_reflection', :options => { :polymorphic => true }, :macro => :belongs_to)
+          @new_post.stub(:commentable)
+          @new_post.class.stub(:reflections).and_return({ 
+            :commentable => double('macro_reflection', :options => { :polymorphic => true }, :macro => :belongs_to)
           })
-          @new_post.stub!(:column_for_attribute).with(:commentable).and_return(
-            mock('column', :type => :integer)
+          @new_post.stub(:column_for_attribute).with(:commentable).and_return(
+            double('column', :type => :integer)
           )
         end
         
@@ -447,15 +447,15 @@ describe 'Formtastic::FormBuilder#inputs' do
       context "with a polymorphic association" do
         
         it 'should raise an error for polymorphic associations (the collection class cannot be guessed)' do
-          @new_post.stub!(:commentable)
-          @new_post.class.stub!(:reflections).and_return({ 
-            :commentable => mock('macro_reflection', :options => { :polymorphic => true }, :macro => :belongs_to)
+          @new_post.stub(:commentable)
+          @new_post.class.stub(:reflections).and_return({ 
+            :commentable => double('macro_reflection', :options => { :polymorphic => true }, :macro => :belongs_to)
           })
-          @new_post.stub!(:column_for_attribute).with(:commentable).and_return(
-            mock('column', :type => :integer)
+          @new_post.stub(:column_for_attribute).with(:commentable).and_return(
+            double('column', :type => :integer)
           )
-          @new_post.class.stub!(:reflect_on_association).with(:commentable).and_return(
-            mock('reflection', :macro => :belongs_to, :options => { :polymorphic => true })
+          @new_post.class.stub(:reflect_on_association).with(:commentable).and_return(
+            double('reflection', :macro => :belongs_to, :options => { :polymorphic => true })
           )
           
           expect { 
@@ -472,7 +472,7 @@ describe 'Formtastic::FormBuilder#inputs' do
     describe 'when a :for option is provided' do
       describe 'and an object is given' do
         it 'should render nested inputs' do
-          @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
+          @bob.stub(:column_for_attribute).and_return(double('column', :type => :string, :limit => 255))
           concat(semantic_form_for(@new_post) do |builder|
             concat(builder.inputs(:login, :for => @bob))
           end)
@@ -516,7 +516,40 @@ describe 'Formtastic::FormBuilder#inputs' do
         output_buffer.should have_tag('form > fieldset#my-id-2.inputs > legend', /^#{@legend_text_using_arg}$/)
       end
     end
-  
+
+    describe 'when a :except option is provided' do
+      describe 'and an object is given' do
+        it 'should render a form with a fieldset containing only string item' do
+          concat(semantic_form_for(@new_post) do |builder|
+            concat(builder.inputs :except => :body)
+          end)
+
+          output_buffer.should have_tag('form > fieldset.inputs > ol > li', :count => 2)
+          output_buffer.should have_tag('form > fieldset.inputs > ol > li.string')
+          output_buffer.should_not have_tag('form > fieldset.inputs > ol > li.text')
+        end
+
+        it 'should render a form with a fieldset containing only text item' do
+          concat(semantic_form_for(@new_post) do |builder|
+            concat(builder.inputs :except => :title)
+          end)
+
+          output_buffer.should have_tag('form > fieldset.inputs > ol > li', :count => 2)
+          output_buffer.should_not have_tag('form > fieldset.inputs > ol > li.string')
+          output_buffer.should have_tag('form > fieldset.inputs > ol > li.text')
+        end
+      end
+
+      describe 'and no object is given' do
+        it 'should render a form with a fieldset containing two list items' do
+          concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
+            concat(builder.inputs(:title, :body))
+          end)
+
+          output_buffer.should have_tag('form > fieldset.inputs > ol > li.string', :count => 2)
+        end
+      end
+    end
   end
   
   describe 'nesting' do

data/spec/helpers/semantic_errors_helper_spec.rb

@@ -11,13 +11,13 @@ describe 'Formtastic::FormBuilder#semantic_errors' do
     @title_errors = ['must not be blank', 'must be awesome']
     @base_errors = ['base error message', 'nasty error']
     @base_error = 'one base error'
-    @errors = mock('errors')
-    @new_post.stub!(:errors).and_return(@errors)
+    @errors = double('errors')
+    @new_post.stub(:errors).and_return(@errors)
   end
 
   describe 'when there is only one error on base' do
     before do
-      @errors.stub!(:[]).with(errors_matcher(:base)).and_return(@base_error)
+      @errors.stub(:[]).with(errors_matcher(:base)).and_return(@base_error)
     end
 
     it 'should render an unordered list' do
@@ -29,7 +29,7 @@ describe 'Formtastic::FormBuilder#semantic_errors' do
 
   describe 'when there is more than one error on base' do
     before do
-      @errors.stub!(:[]).with(errors_matcher(:base)).and_return(@base_errors)
+      @errors.stub(:[]).with(errors_matcher(:base)).and_return(@base_errors)
     end
 
     it 'should render an unordered list' do
@@ -44,8 +44,8 @@ describe 'Formtastic::FormBuilder#semantic_errors' do
 
   describe 'when there are errors on title' do
     before do
-      @errors.stub!(:[]).with(errors_matcher(:title)).and_return(@title_errors)
-      @errors.stub!(:[]).with(errors_matcher(:base)).and_return([])
+      @errors.stub(:[]).with(errors_matcher(:title)).and_return(@title_errors)
+      @errors.stub(:[]).with(errors_matcher(:base)).and_return([])
     end
 
     it 'should render an unordered list' do
@@ -58,8 +58,8 @@ describe 'Formtastic::FormBuilder#semantic_errors' do
 
   describe 'when there are errors on title and base' do
     before do
-      @errors.stub!(:[]).with(errors_matcher(:title)).and_return(@title_errors)
-      @errors.stub!(:[]).with(errors_matcher(:base)).and_return(@base_error)
+      @errors.stub(:[]).with(errors_matcher(:title)).and_return(@title_errors)
+      @errors.stub(:[]).with(errors_matcher(:base)).and_return(@base_error)
     end
 
     it 'should render an unordered list' do
@@ -73,8 +73,8 @@ describe 'Formtastic::FormBuilder#semantic_errors' do
 
   describe 'when there are no errors' do
     before do
-      @errors.stub!(:[]).with(errors_matcher(:title)).and_return(nil)
-      @errors.stub!(:[]).with(errors_matcher(:base)).and_return(nil)
+      @errors.stub(:[]).with(errors_matcher(:title)).and_return(nil)
+      @errors.stub(:[]).with(errors_matcher(:base)).and_return(nil)
     end
 
     it 'should return nil' do
@@ -86,7 +86,7 @@ describe 'Formtastic::FormBuilder#semantic_errors' do
 
   describe 'when there is one error on base and options with class is passed' do
     before do
-      @errors.stub!(:[]).with(errors_matcher(:base)).and_return(@base_error)
+      @errors.stub(:[]).with(errors_matcher(:base)).and_return(@base_error)
     end
 
     it 'should render an unordered list with given class' do
@@ -98,7 +98,7 @@ describe 'Formtastic::FormBuilder#semantic_errors' do
   
   describe 'when :base is passed in as an argument' do
     before do
-      @errors.stub!(:[]).with(errors_matcher(:base)).and_return(@base_error)
+      @errors.stub(:[]).with(errors_matcher(:base)).and_return(@base_error)
     end
 
     it 'should ignore :base and only render base errors once' do

data/spec/i18n_spec.rb

@@ -6,12 +6,12 @@ describe 'Formtastic::I18n' do
   FORMTASTIC_KEYS = [:required, :yes, :no, :create, :update].freeze
 
   it "should be defined" do
-    lambda { Formtastic::I18n }.should_not raise_error(::NameError)
+    lambda { Formtastic::I18n }.should_not raise_error
   end
 
   describe "default translations" do
     it "should be defined" do
-      lambda { Formtastic::I18n::DEFAULT_VALUES }.should_not raise_error(::NameError)
+      lambda { Formtastic::I18n::DEFAULT_VALUES }.should_not raise_error
       Formtastic::I18n::DEFAULT_VALUES.is_a?(::Hash).should == true
     end
 
@@ -98,8 +98,8 @@ describe 'Formtastic::I18n' do
           }
         }}
 
-      @new_post.stub!(:title)
-      @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :string, :limit => 255))
+      @new_post.stub(:title)
+      @new_post.stub(:column_for_attribute).with(:title).and_return(double('column', :type => :string, :limit => 255))
     end
 
     after do
@@ -108,7 +108,7 @@ describe 'Formtastic::I18n' do
 
     it "lookup scopes should be defined" do
       with_config :i18n_lookups_by_default, true do
-        lambda { Formtastic::I18n::SCOPES }.should_not raise_error(::NameError)
+        lambda { Formtastic::I18n::SCOPES }.should_not raise_error
       end
     end
 

data/spec/inputs/boolean_input_spec.rb

@@ -98,7 +98,7 @@ describe 'boolean input' do
   end
 
   it 'should generate a checked input if object.method returns checked value' do
-    @new_post.stub!(:allow_comments).and_return('yes')
+    @new_post.stub(:allow_comments).and_return('yes')
 
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:allow_comments, :as => :boolean, :checked_value => 'yes', :unchecked_value => 'no'))
@@ -108,7 +108,7 @@ describe 'boolean input' do
   end
 
   it 'should not generate a checked input if object.method returns unchecked value' do
-    @new_post.stub!(:allow_comments).and_return('no')
+    @new_post.stub(:allow_comments).and_return('no')
 
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:allow_comments, :as => :boolean, :checked_value => 'yes', :unchecked_value => 'no'))
@@ -118,7 +118,7 @@ describe 'boolean input' do
   end
 
   it 'should generate a checked input if object.method returns checked value' do
-    @new_post.stub!(:allow_comments).and_return('yes')
+    @new_post.stub(:allow_comments).and_return('yes')
 
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:allow_comments, :as => :boolean, :checked_value => 'yes', :unchecked_value => 'no'))
@@ -128,7 +128,7 @@ describe 'boolean input' do
   end
 
   it 'should not generate a checked input if object.method returns unchecked value' do
-    @new_post.stub!(:allow_comments).and_return('no')
+    @new_post.stub(:allow_comments).and_return('no')
 
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:allow_comments, :as => :boolean, :checked_value => 'yes', :unchecked_value => 'no'))
@@ -153,9 +153,10 @@ describe 'boolean input' do
   
   it 'should not pass input_html options down to the label html' do
     concat(semantic_form_for(@new_post) do |builder|
-      builder.input(:title, :as => :boolean, :input_html => { :tabindex => 2 })
+      builder.input(:title, :as => :boolean, :input_html => { :tabindex => 2, :x => "X" })
     end)
     output_buffer.should_not have_tag('label[tabindex]')
+    output_buffer.should_not have_tag('label[x]')
   end
 
   context "when required" do

data/spec/inputs/check_boxes_input_spec.rb

@@ -194,7 +194,7 @@ describe 'check_boxes input' do
 
       describe "no disabled items" do
         before do
-          @new_post.stub!(:author_ids).and_return(nil)
+          @new_post.stub(:author_ids).and_return(nil)
 
           concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:authors, :as => :check_boxes, :disabled => nil))
@@ -208,7 +208,7 @@ describe 'check_boxes input' do
 
       describe "single disabled item" do
         before do
-          @new_post.stub!(:author_ids).and_return(nil)
+          @new_post.stub(:author_ids).and_return(nil)
 
           concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:authors, :as => :check_boxes, :disabled => @fred.id))
@@ -224,7 +224,7 @@ describe 'check_boxes input' do
 
       describe "multiple disabled items" do
         before do
-          @new_post.stub!(:author_ids).and_return(nil)
+          @new_post.stub(:author_ids).and_return(nil)
 
           concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:authors, :as => :check_boxes, :disabled => [@bob.id, @fred.id]))
@@ -247,7 +247,7 @@ describe 'check_boxes input' do
       before do
         ::I18n.backend.store_translations :en, :formtastic => { :labels => { :post => { :authors => "Translated!" }}}
         with_config :i18n_lookups_by_default, true do
-          @new_post.stub!(:author_ids).and_return(nil)
+          @new_post.stub(:author_ids).and_return(nil)
           concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:authors, :as => :check_boxes))
           end)
@@ -266,7 +266,7 @@ describe 'check_boxes input' do
 
     describe "when :label option is set" do
       before do
-        @new_post.stub!(:author_ids).and_return(nil)
+        @new_post.stub(:author_ids).and_return(nil)
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:authors, :as => :check_boxes, :label => 'The authors'))
         end)
@@ -280,7 +280,7 @@ describe 'check_boxes input' do
     describe "when :label option is false" do
       before do
         @output_buffer = ''
-        @new_post.stub!(:author_ids).and_return(nil)
+        @new_post.stub(:author_ids).and_return(nil)
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:authors, :as => :check_boxes, :label => false))
         end)
@@ -298,7 +298,7 @@ describe 'check_boxes input' do
 
     describe "when :required option is true" do
       before do
-        @new_post.stub!(:author_ids).and_return(nil)
+        @new_post.stub(:author_ids).and_return(nil)
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:authors, :as => :check_boxes, :required => true))
         end)
@@ -344,9 +344,9 @@ describe 'check_boxes input' do
       end
 
       it 'to set the right input value' do
-        item = mock('item')
+        item = double('item')
         item.should_not_receive(:id)
-        item.stub!(:custom_value).and_return('custom_value')
+        item.stub(:custom_value).and_return('custom_value')
         item.should_receive(:custom_value).exactly(3).times
         @new_post.author.should_receive(:custom_value).exactly(1).times
         concat(semantic_form_for(@new_post) do |builder|
@@ -373,6 +373,24 @@ describe 'check_boxes input' do
       output_buffer.should have_tag("form li fieldset ol li label input[@value='biography'][@checked='checked']")
     end
   end
+  
+  describe 'when :collection is a set' do
+    before do
+      @output_buffer = ''
+      mock_everything
+      @fred.stub(:roles) { Set.new([:reviewer, :admin]) }
+      
+      concat(semantic_form_for(@fred) do |builder|
+        concat(builder.input(:roles, :as => :check_boxes, :collection => [['User', :user], ['Reviewer', :reviewer], ['Administrator', :admin]]))
+      end)
+    end
+    
+    it 'should check the correct checkboxes' do
+      output_buffer.should have_tag("form li fieldset ol li label input[@value='user']")
+      output_buffer.should have_tag("form li fieldset ol li label input[@value='admin'][@checked='checked']")
+      output_buffer.should have_tag("form li fieldset ol li label input[@value='reviewer'][@checked='checked']")
+    end
+  end
 
   describe "when namespace is provided" do
 

data/spec/inputs/country_input_spec.rb

@@ -26,7 +26,7 @@ describe 'country input' do
 
     before do
       concat(semantic_form_for(@new_post) do |builder|
-        builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
+        builder.stub(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
         concat(builder.input(:country, :as => :country))
       end)
     end
@@ -55,7 +55,7 @@ describe 'country input' do
     it "should be passed down to the country_select helper when provided" do
       priority_countries = ["Foo", "Bah"]
       semantic_form_for(@new_post) do |builder|
-        builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
+        builder.stub(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
         builder.should_receive(:country_select).with(:country, priority_countries, {}, {:id => "post_country", :required => false, :autofocus => false}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
 
         concat(builder.input(:country, :as => :country, :priority_countries => priority_countries))
@@ -68,7 +68,7 @@ describe 'country input' do
       priority_countries.should_not be_nil
 
       semantic_form_for(@new_post) do |builder|
-        builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
+        builder.stub(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
         builder.should_receive(:country_select).with(:country, priority_countries, {}, {:id => "post_country", :required => false, :autofocus => false}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
 
         concat(builder.input(:country, :as => :country))
@@ -84,7 +84,7 @@ describe 'country input' do
       mock_everything
 
       concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
-        builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
+        builder.stub(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
         builder.should_receive(:country_select).with(:country, [], {}, {:id => "context2_post_country", :required => false, :autofocus => false}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
         concat(builder.input(:country, :priority_countries => []))
       end)
@@ -101,7 +101,7 @@ describe 'country input' do
 
       before do
         concat(semantic_form_for(@new_post) do |builder|
-          builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
+          builder.stub(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
           concat(builder.input(:country))
         end)
       end