formtastic 2.3.0.rc2 → 2.3.0.rc3

data/spec/inputs/custom_input_spec.rb

@@ -45,7 +45,7 @@ describe 'AnyCustomInput' do
 
     describe 'with an implementation' do
       it "should raise a NotImplementedError exception" do
-        expect { ::ImplementedInput.new(*input_args).to_html }.to_not raise_error(NotImplementedError)
+        expect { ::ImplementedInput.new(*input_args).to_html }.to_not raise_error
       end
     end
     

data/spec/inputs/date_picker_input_spec.rb

@@ -122,7 +122,7 @@ describe 'date_picker input' do
       
       before do
         @date = Date.new(2000, 11, 11)
-        @new_post.stub!(:publish_at).and_return(@date)
+        @new_post.stub(:publish_at).and_return(@date)
       end
       
       it "renders the date as YYYY-MM-DD" do
@@ -149,7 +149,7 @@ describe 'date_picker input' do
     
       before do
         @time = Time.utc(2000,11,11,11,11,11)
-        @new_post.stub!(:publish_at).and_return(@time)
+        @new_post.stub(:publish_at).and_return(@time)
       end
       
       it "renders the time as a YYYY-MM-DD" do
@@ -175,7 +175,7 @@ describe 'date_picker input' do
     context "when method returns an empty String" do
       
       before do
-        @new_post.stub!(:publish_at).and_return("")
+        @new_post.stub(:publish_at).and_return("")
       end
       
       it "will be empty" do
@@ -201,7 +201,7 @@ describe 'date_picker input' do
     context "when method returns a String" do
       
       before do
-        @new_post.stub!(:publish_at).and_return("yeah")
+        @new_post.stub(:publish_at).and_return("yeah")
       end
       
       it "will be the string" do

data/spec/inputs/datetime_picker_input_spec.rb

@@ -157,7 +157,7 @@ describe 'datetime_picker input' do
       
       before do
         @date = Date.new(2000, 11, 11)
-        @new_post.stub!(:publish_at).and_return(@date)
+        @new_post.stub(:publish_at).and_return(@date)
       end
       
       it "renders the date as YYYY-MM-DDT00:00:00" do
@@ -184,7 +184,7 @@ describe 'datetime_picker input' do
     
       before do
         @time = Time.utc(2000,11,11,11,11,11)
-        @new_post.stub!(:publish_at).and_return(@time)
+        @new_post.stub(:publish_at).and_return(@time)
       end
       
       it "renders the time as a YYYY-MM-DD HH:MM" do
@@ -210,7 +210,7 @@ describe 'datetime_picker input' do
     context "when method returns an empty String" do
       
       before do
-        @new_post.stub!(:publish_at).and_return("")
+        @new_post.stub(:publish_at).and_return("")
       end
       
       it "will be empty" do
@@ -236,7 +236,7 @@ describe 'datetime_picker input' do
     context "when method returns a String" do
       
       before do
-        @new_post.stub!(:publish_at).and_return("yeah")
+        @new_post.stub(:publish_at).and_return("yeah")
       end
       
       it "will be the string" do

data/spec/inputs/hidden_input_spec.rb

@@ -53,9 +53,9 @@ describe 'hidden input' do
   end
 
   it "should not render inline errors" do
-    @errors = mock('errors')
-    @errors.stub!(:[]).with(errors_matcher(:secret)).and_return(["foo", "bah"])
-    @new_post.stub!(:errors).and_return(@errors)
+    @errors = double('errors')
+    @errors.stub(:[]).with(errors_matcher(:secret)).and_return(["foo", "bah"])
+    @new_post.stub(:errors).and_return(@errors)
 
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:secret, :as => :hidden))

data/spec/inputs/include_blank_spec.rb

@@ -9,8 +9,8 @@ describe "*select: options[:include_blank]" do
     @output_buffer = ''
     mock_everything
 
-    @new_post.stub!(:author_id).and_return(nil)
-    @new_post.stub!(:publish_at).and_return(nil)
+    @new_post.stub(:author_id).and_return(nil)
+    @new_post.stub(:publish_at).and_return(nil)
   end
 
   SELECT_INPUT_TYPES = {

data/spec/inputs/number_input_spec.rb

@@ -9,7 +9,7 @@ describe 'number input' do
     @output_buffer = ''
     mock_everything
     
-    @new_post.class.stub!(:validators_on).with(:title).and_return([
+    @new_post.class.stub(:validators_on).with(:title).and_return([
       active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :greater_than=>2})
     ])
   end
@@ -109,7 +109,7 @@ describe 'number input' do
   
   describe "when validations require a minimum value (:greater_than)" do
     before do
-      @new_post.class.stub!(:validators_on).with(:title).and_return([
+      @new_post.class.stub(:validators_on).with(:title).and_return([
         active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :greater_than=>2})
       ])
     end
@@ -144,7 +144,7 @@ describe 'number input' do
     
     describe "and the column is an integer" do
       before do
-        @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :integer))
+        @new_post.stub(:column_for_attribute).with(:title).and_return(double('column', :type => :integer))
       end
       
       it "should add a min attribute to the input one greater than the validation" do
@@ -157,7 +157,7 @@ describe 'number input' do
     
     describe "and the column is a float" do
       before do
-        @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :float))
+        @new_post.stub(:column_for_attribute).with(:title).and_return(double('column', :type => :float))
       end
       
       it "should raise an error" do
@@ -171,7 +171,7 @@ describe 'number input' do
     
     describe "and the column is a big decimal" do
       before do
-        @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :decimal))
+        @new_post.stub(:column_for_attribute).with(:title).and_return(double('column', :type => :decimal))
       end
       
       it "should raise an error" do
@@ -187,7 +187,7 @@ describe 'number input' do
   
   describe "when validations require a minimum value (:greater_than) that takes a proc" do
     before do
-      @new_post.class.stub!(:validators_on).with(:title).and_return([
+      @new_post.class.stub(:validators_on).with(:title).and_return([
         active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :greater_than=> Proc.new {|post| 2}})
       ])
     end
@@ -222,7 +222,7 @@ describe 'number input' do
     
     describe "and the column is an integer" do
       before do
-        @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :integer))
+        @new_post.stub(:column_for_attribute).with(:title).and_return(double('column', :type => :integer))
       end
       
       it "should add a min attribute to the input one greater than the validation" do
@@ -235,7 +235,7 @@ describe 'number input' do
     
     describe "and the column is a float" do
       before do
-        @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :float))
+        @new_post.stub(:column_for_attribute).with(:title).and_return(double('column', :type => :float))
       end
       
       it "should raise an error" do
@@ -249,7 +249,7 @@ describe 'number input' do
     
     describe "and the column is a big decimal" do
       before do
-        @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :decimal))
+        @new_post.stub(:column_for_attribute).with(:title).and_return(double('column', :type => :decimal))
       end
       
       it "should raise an error" do
@@ -265,7 +265,7 @@ describe 'number input' do
   
   describe "when validations require a minimum value (:greater_than_or_equal_to)" do
     before do
-      @new_post.class.stub!(:validators_on).with(:title).and_return([
+      @new_post.class.stub(:validators_on).with(:title).and_return([
         active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :greater_than_or_equal_to=>2})
       ])
     end
@@ -302,7 +302,7 @@ describe 'number input' do
     [:integer, :decimal, :float].each do |column_type|
       describe "and the column is a #{column_type}" do
         before do
-          @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => column_type))
+          @new_post.stub(:column_for_attribute).with(:title).and_return(double('column', :type => column_type))
         end
 
         it "should add a max attribute to the input equal to the validation" do
@@ -316,7 +316,7 @@ describe 'number input' do
 
     describe "and there is no column" do
       before do
-        @new_post.stub!(:column_for_attribute).with(:title).and_return(nil)
+        @new_post.stub(:column_for_attribute).with(:title).and_return(nil)
       end
     
       it "should add a max attribute to the input equal to the validation" do
@@ -330,7 +330,7 @@ describe 'number input' do
   
   describe "when validations require a minimum value (:greater_than_or_equal_to) that takes a Proc" do
      before do
-       @new_post.class.stub!(:validators_on).with(:title).and_return([
+       @new_post.class.stub(:validators_on).with(:title).and_return([
          active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :greater_than_or_equal_to=> Proc.new { |post| 2}})
        ])
      end
@@ -367,7 +367,7 @@ describe 'number input' do
      [:integer, :decimal, :float].each do |column_type|
        describe "and the column is a #{column_type}" do
          before do
-           @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => column_type))
+           @new_post.stub(:column_for_attribute).with(:title).and_return(double('column', :type => column_type))
          end
 
          it "should add a max attribute to the input equal to the validation" do
@@ -381,7 +381,7 @@ describe 'number input' do
 
      describe "and there is no column" do
        before do
-         @new_post.stub!(:column_for_attribute).with(:title).and_return(nil)
+         @new_post.stub(:column_for_attribute).with(:title).and_return(nil)
        end
 
        it "should add a max attribute to the input equal to the validation" do
@@ -396,7 +396,7 @@ describe 'number input' do
   describe "when validations require a maximum value (:less_than)" do
     
    before do
-     @new_post.class.stub!(:validators_on).with(:title).and_return([
+     @new_post.class.stub(:validators_on).with(:title).and_return([
        active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :less_than=>20})
      ])
    end
@@ -431,7 +431,7 @@ describe 'number input' do
    
    describe "and the column is an integer" do
      before do
-       @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :integer))
+       @new_post.stub(:column_for_attribute).with(:title).and_return(double('column', :type => :integer))
      end
      
      it "should add a max attribute to the input one greater than the validation" do
@@ -444,7 +444,7 @@ describe 'number input' do
    
    describe "and the column is a float" do
      before do
-       @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :float))
+       @new_post.stub(:column_for_attribute).with(:title).and_return(double('column', :type => :float))
      end
      
      it "should raise an error" do
@@ -458,7 +458,7 @@ describe 'number input' do
    
    describe "and the column is a big decimal" do
      before do
-       @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :decimal))
+       @new_post.stub(:column_for_attribute).with(:title).and_return(double('column', :type => :decimal))
      end
      
      it "should raise an error" do
@@ -471,7 +471,7 @@ describe 'number input' do
    end
    describe "and the validator takes a proc" do
      before do
-       @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :decimal))
+       @new_post.stub(:column_for_attribute).with(:title).and_return(double('column', :type => :decimal))
      end
    end
   end
@@ -479,7 +479,7 @@ describe 'number input' do
   describe "when validations require a maximum value (:less_than) that takes a Proc" do
     
    before do
-     @new_post.class.stub!(:validators_on).with(:title).and_return([
+     @new_post.class.stub(:validators_on).with(:title).and_return([
        active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :less_than=> Proc.new {|post| 20 }})
      ])
    end
@@ -514,7 +514,7 @@ describe 'number input' do
    
    describe "and the column is an integer" do
      before do
-       @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :integer))
+       @new_post.stub(:column_for_attribute).with(:title).and_return(double('column', :type => :integer))
      end
      
      it "should add a max attribute to the input one greater than the validation" do
@@ -527,7 +527,7 @@ describe 'number input' do
    
    describe "and the column is a float" do
      before do
-       @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :float))
+       @new_post.stub(:column_for_attribute).with(:title).and_return(double('column', :type => :float))
      end
      
      it "should raise an error" do
@@ -541,7 +541,7 @@ describe 'number input' do
    
    describe "and the column is a big decimal" do
      before do
-       @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :decimal))
+       @new_post.stub(:column_for_attribute).with(:title).and_return(double('column', :type => :decimal))
      end
      
      it "should raise an error" do
@@ -554,7 +554,7 @@ describe 'number input' do
    end
    describe "and the validator takes a proc" do
      before do
-       @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :decimal))
+       @new_post.stub(:column_for_attribute).with(:title).and_return(double('column', :type => :decimal))
      end
    end
   end
@@ -562,7 +562,7 @@ describe 'number input' do
   
   describe "when validations require a maximum value (:less_than_or_equal_to)" do
     before do
-      @new_post.class.stub!(:validators_on).with(:title).and_return([
+      @new_post.class.stub(:validators_on).with(:title).and_return([
         active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :less_than_or_equal_to=>20})
       ])
     end
@@ -598,7 +598,7 @@ describe 'number input' do
     [:integer, :decimal, :float].each do |column_type|
       describe "and the column is a #{column_type}" do
         before do
-          @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => column_type))
+          @new_post.stub(:column_for_attribute).with(:title).and_return(double('column', :type => column_type))
         end
 
         it "should add a max attribute to the input equal to the validation" do
@@ -612,7 +612,7 @@ describe 'number input' do
 
     describe "and there is no column" do
       before do
-        @new_post.stub!(:column_for_attribute).with(:title).and_return(nil)
+        @new_post.stub(:column_for_attribute).with(:title).and_return(nil)
       end
     
       it "should add a max attribute to the input equal to the validation" do
@@ -626,7 +626,7 @@ describe 'number input' do
  
   describe "when validations require a maximum value (:less_than_or_equal_to) that takes a proc" do
      before do
-       @new_post.class.stub!(:validators_on).with(:title).and_return([
+       @new_post.class.stub(:validators_on).with(:title).and_return([
          active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :less_than_or_equal_to=> Proc.new { |post| 20 }})
        ])
      end
@@ -662,7 +662,7 @@ describe 'number input' do
      [:integer, :decimal, :float].each do |column_type|
        describe "and the column is a #{column_type}" do
          before do
-           @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => column_type))
+           @new_post.stub(:column_for_attribute).with(:title).and_return(double('column', :type => column_type))
          end
 
          it "should add a max attribute to the input equal to the validation" do
@@ -676,7 +676,7 @@ describe 'number input' do
 
      describe "and there is no column" do
        before do
-         @new_post.stub!(:column_for_attribute).with(:title).and_return(nil)
+         @new_post.stub(:column_for_attribute).with(:title).and_return(nil)
        end
 
        it "should add a max attribute to the input equal to the validation" do
@@ -690,7 +690,7 @@ describe 'number input' do
   
   describe "when validations require conflicting minimum values (:greater_than, :greater_than_or_equal_to)" do
     before do
-      @new_post.class.stub!(:validators_on).with(:title).and_return([
+      @new_post.class.stub(:validators_on).with(:title).and_return([
         active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :greater_than => 20, :greater_than_or_equal_to=>2})
       ])
     end
@@ -705,7 +705,7 @@ describe 'number input' do
   
   describe "when validations require conflicting maximum values (:less_than, :less_than_or_equal_to)" do
     before do
-      @new_post.class.stub!(:validators_on).with(:title).and_return([
+      @new_post.class.stub(:validators_on).with(:title).and_return([
         active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :less_than => 20, :less_than_or_equal_to=>2})
       ])
     end
@@ -721,7 +721,7 @@ describe 'number input' do
   describe "when validations require only an integer (:only_integer)" do
     
     before do
-      @new_post.class.stub!(:validators_on).with(:title).and_return([
+      @new_post.class.stub(:validators_on).with(:title).and_return([
         active_model_numericality_validator([:title], {:allow_nil=>false, :only_integer=>true})
       ])
     end
@@ -752,7 +752,7 @@ describe 'number input' do
   describe "when validations require a :step (non standard)" do
     
     before do
-      @new_post.class.stub!(:validators_on).with(:title).and_return([
+      @new_post.class.stub(:validators_on).with(:title).and_return([
         active_model_numericality_validator([:title], {:allow_nil=>false, :only_integer=>true, :step=>2})
       ])
     end
@@ -783,7 +783,7 @@ describe 'number input' do
   describe "when validations do not specify :step (non standard) or :only_integer" do
     
     before do
-      @new_post.class.stub!(:validators_on).with(:title).and_return([
+      @new_post.class.stub(:validators_on).with(:title).and_return([
         active_model_numericality_validator([:title], {:allow_nil=>false})
       ])
     end

data/spec/inputs/radio_input_spec.rb

@@ -158,7 +158,7 @@ describe 'radio input' 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 => :radio))
         end)
@@ -177,7 +177,7 @@ describe 'radio 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 => :radio, :label => 'The authors'))
       end)
@@ -191,7 +191,7 @@ describe 'radio 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 => :radio, :label => false))
       end)
@@ -209,7 +209,7 @@ describe 'radio 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 => :radio, :required => true))
       end)
@@ -223,7 +223,7 @@ describe 'radio input' do
   describe "when :namespace is given on form" 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, :namespace => "custom_prefix") do |builder|
         concat(builder.input(:authors, :as => :radio, :label => ''))
       end)
@@ -279,4 +279,22 @@ describe 'radio input' do
     end
   end
 
+  describe "when collection contains symbols" do
+    before do
+      @output_buffer = ''
+      mock_everything
+
+      concat(semantic_form_for(:project) do |builder|
+        concat(builder.input(:author_id, :as => :radio, :collection => Set.new([["A", :a], ["B", :b], ["C", :c]])))
+      end)
+    end
+
+    it 'should output the correct labels' do
+      output_buffer.should have_tag("li.choice label", /A/)
+      output_buffer.should have_tag("li.choice label", /B/)
+      output_buffer.should have_tag("li.choice label", /C/)
+    end
+  end
+
+
 end