formtastic 3.1.5 → 4.0.0.rc1

data/spec/inputs/color_input_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe 'color input' do
+RSpec.describe 'color input' do
 
   include FormtasticSpecHelper
 
@@ -10,85 +10,73 @@ describe 'color input' do
     mock_everything
   end
 
-  if Formtastic::Util.rails3?
-    describe "attempting to use color input with Rails 3" do
-      it "raises an error" do
-        expect {
-          concat(semantic_form_for(@new_post) do |builder|
-            concat(builder.input(:color))
-          end)
-        }.to raise_error "The :color input requires the color_field form helper, which is only available in Rails 4+"
-      end
+  describe "when object is provided" do
+    before do
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:color))
+      end)
     end
-  else
-    describe "when object is provided" do
-      before do
-        concat(semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:color))
-        end)
-      end
 
-      it_should_have_input_wrapper_with_class(:color)
-      it_should_have_input_wrapper_with_class(:input)
-      it_should_have_input_wrapper_with_class(:stringish)
-      it_should_have_input_wrapper_with_id("post_color_input")
-      it_should_have_label_with_text(/Color/)
-      it_should_have_label_for("post_color")
-      it_should_have_input_with_id("post_color")
-      it_should_have_input_with_type(:color)
-      it_should_have_input_with_name("post[color]")
+    it_should_have_input_wrapper_with_class(:color)
+    it_should_have_input_wrapper_with_class(:input)
+    it_should_have_input_wrapper_with_class(:stringish)
+    it_should_have_input_wrapper_with_id("post_color_input")
+    it_should_have_label_with_text(/Color/)
+    it_should_have_label_for("post_color")
+    it_should_have_input_with_id("post_color")
+    it_should_have_input_with_type(:color)
+    it_should_have_input_with_name("post[color]")
 
-    end
+  end
 
-    describe "when namespace is provided" do
+  describe "when namespace is provided" do
 
-      before do
-        concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
-          concat(builder.input(:color))
-        end)
-      end
+    before do
+      concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
+        concat(builder.input(:color))
+      end)
+    end
 
-      it_should_have_input_wrapper_with_id("context2_post_color_input")
-      it_should_have_label_and_input_with_id("context2_post_color")
+    it_should_have_input_wrapper_with_id("context2_post_color_input")
+    it_should_have_label_and_input_with_id("context2_post_color")
 
-    end
+  end
 
-    describe "when index is provided" do
+  describe "when index is provided" do
 
-      before do
-        @output_buffer = ''
-        mock_everything
+    before do
+      @output_buffer = ''
+      mock_everything
 
-        concat(semantic_form_for(@new_post) do |builder|
-          concat(builder.fields_for(:author, :index => 3) do |author|
-            concat(author.input(:name, :as => :color))
-          end)
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.fields_for(:author, :index => 3) do |author|
+          concat(author.input(:name, :as => :color))
         end)
-      end
-
-      it 'should index the id of the wrapper' do
-        output_buffer.should have_tag("li#post_author_attributes_3_name_input")
-      end
+      end)
+    end
 
-      it 'should index the id of the select tag' do
-        output_buffer.should have_tag("input#post_author_attributes_3_name")
-      end
+    it 'should index the id of the wrapper' do
+      expect(output_buffer).to have_tag("li#post_author_attributes_3_name_input")
+    end
 
-      it 'should index the name of the select tag' do
-        output_buffer.should have_tag("input[@name='post[author_attributes][3][name]']")
-      end
+    it 'should index the id of the select tag' do
+      expect(output_buffer).to have_tag("input#post_author_attributes_3_name")
+    end
 
+    it 'should index the name of the select tag' do
+      expect(output_buffer).to have_tag("input[@name='post[author_attributes][3][name]']")
     end
 
+  end
+
 
-    describe "when required" do
-      it "should add the required attribute to the input's html options" do
-        with_config :use_required_attribute, true do
-          concat(semantic_form_for(@new_post) do |builder|
-            concat(builder.input(:title, :as => :color, :required => true))
-          end)
-          output_buffer.should have_tag("input[@required]")
-        end
+  describe "when required" do
+    it "should add the required attribute to the input's html options" do
+      with_config :use_required_attribute, true do
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:title, :as => :color, :required => true))
+        end)
+        expect(output_buffer).to have_tag("input[@required]")
       end
     end
   end

data/spec/inputs/country_input_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe 'country input' do
+RSpec.describe 'country input' do
 
   include FormtasticSpecHelper
 
@@ -13,11 +13,11 @@ describe 'country input' do
   describe "when country_select is not available as a helper from a plugin" do
 
     it "should raise an error, sugesting the author installs a plugin" do
-      lambda {
+      expect {
         semantic_form_for(@new_post) do |builder|
           concat(builder.input(:country, :as => :country))
         end
-      }.should raise_error(Formtastic::Inputs::CountryInput::CountrySelectPluginMissing)
+      }.to raise_error(Formtastic::Inputs::CountryInput::CountrySelectPluginMissing)
     end
 
   end
@@ -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>"))
+        allow(builder).to receive(:country_select).and_return("<select><option>...</option></select>".html_safe)
         concat(builder.input(:country, :as => :country))
       end)
     end
@@ -39,13 +39,13 @@ describe 'country input' do
     #it_should_apply_error_logic_for_input_type(:country)
 
     it 'should generate a label for the input' do
-      output_buffer.should have_tag('form li label')
-      output_buffer.should have_tag('form li label[@for="post_country"]')
-      output_buffer.should have_tag('form li label', /Country/)
+      expect(output_buffer).to have_tag('form li label')
+      expect(output_buffer).to have_tag('form li label[@for="post_country"]')
+      expect(output_buffer).to have_tag('form li label', :text => /Country/)
     end
 
     it "should generate a select" do
-      output_buffer.should have_tag("form li select")
+      expect(output_buffer).to have_tag("form li select")
     end
 
   end
@@ -55,8 +55,8 @@ 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.should_receive(:country_select).with(:country, priority_countries, {}, {:id => "post_country", :required => false, :autofocus => false, :readonly => false}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
+        allow(builder).to receive(:country_select).and_return("<select><option>...</option></select>".html_safe)
+        expect(builder).to receive(:country_select).with(:country, priority_countries, {}, {:id => "post_country", :required => false, :autofocus => false, :readonly => false}).and_return("<select><option>...</option></select>".html_safe)
 
         concat(builder.input(:country, :as => :country, :priority_countries => priority_countries))
       end
@@ -64,12 +64,12 @@ describe 'country input' do
 
     it "should default to the @@priority_countries config when absent" do
       priority_countries = Formtastic::FormBuilder.priority_countries
-      priority_countries.should_not be_empty
-      priority_countries.should_not be_nil
+      expect(priority_countries).not_to be_empty
+      expect(priority_countries).not_to be_nil
 
       semantic_form_for(@new_post) do |builder|
-        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, :readonly => false}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
+        allow(builder).to receive(:country_select).and_return("<select><option>...</option></select>".html_safe)
+        expect(builder).to receive(:country_select).with(:country, priority_countries, {}, {:id => "post_country", :required => false, :autofocus => false, :readonly => false}).and_return("<select><option>...</option></select>".html_safe)
 
         concat(builder.input(:country, :as => :country))
       end
@@ -84,8 +84,8 @@ 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.should_receive(:country_select).with(:country, [], {}, {:id => "context2_post_country", :required => false, :autofocus => false, :readonly => false}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
+        allow(builder).to receive(:country_select).and_return("<select><option>...</option></select>".html_safe)
+        expect(builder).to receive(:country_select).with(:country, [], {}, {:id => "context2_post_country", :required => false, :autofocus => false, :readonly => false}).and_return("<select><option>...</option></select>".html_safe)
         concat(builder.input(:country, :priority_countries => []))
       end)
     end
@@ -101,13 +101,13 @@ 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>"))
+          allow(builder).to receive(:country_select).and_return("<select><option>...</option></select>".html_safe)
           concat(builder.input(:country))
         end)
       end
 
       it "should render a country input" do
-        output_buffer.should have_tag "form li.country"
+        expect(output_buffer).to have_tag "form li.country"
       end
     end
 
@@ -121,8 +121,8 @@ describe 'country input' do
       end
 
       it "should render a country input" do
-        output_buffer.should_not have_tag "form li.country"
-        output_buffer.should have_tag "form li.string", :count => 2
+        expect(output_buffer).not_to have_tag "form li.country"
+        expect(output_buffer).to have_tag "form li.string", :count => 2
       end
 
     end

data/spec/inputs/custom_input_spec.rb

@@ -11,11 +11,7 @@ module TestInputs
     @method = :title
     @options = {}
     @proc = Proc.new {}
-    if Rails::VERSION::MAJOR == 4
-      @builder = Formtastic::FormBuilder.new(@object_name, @object, @template, @options)
-    else
-      @builder = Formtastic::FormBuilder.new(@object_name, @object, @template, @options, @proc)
-    end
+    @builder = Formtastic::FormBuilder.new(@object_name, @object, @template, @options)
     [@builder, @template, @object, @object_name, @method, @options]
   end
   
@@ -31,7 +27,7 @@ module TestInputs
   
 end
 
-describe 'AnyCustomInput' do
+RSpec.describe 'AnyCustomInput' do
   
   include TestInputs
   

data/spec/inputs/datalist_input_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe "datalist inputs" do
+RSpec.describe "datalist inputs" do
   include FormtasticSpecHelper
 
   before do

data/spec/inputs/date_picker_input_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe 'date_picker input' do
+RSpec.describe 'date_picker input' do
 
   include FormtasticSpecHelper
 
@@ -40,7 +40,7 @@ describe 'date_picker input' do
           concat(f.input(:publish_at, :as => :date_picker))
         end
       )
-      output_buffer.should have_tag "input[size='10']"
+      expect(output_buffer).to have_tag "input[size='10']"
     end
     
     it "can be set from :input_html options" do
@@ -49,7 +49,7 @@ describe 'date_picker input' do
           concat(f.input(:publish_at, :as => :date_picker, :input_html => { :size => "11" }))
         end
       )
-      output_buffer.should have_tag "input[size='11']"
+      expect(output_buffer).to have_tag "input[size='11']"
     end
     
     it "can be set from options (ignoring input_html)" do
@@ -58,7 +58,7 @@ describe 'date_picker input' do
           concat(f.input(:publish_at, :as => :date_picker, :size => '12', :input_html => { :size => "11" }))
         end
       )
-      output_buffer.should have_tag "input[size='12']"
+      expect(output_buffer).to have_tag "input[size='12']"
     end
 
   end
@@ -71,7 +71,7 @@ describe 'date_picker input' do
           concat(f.input(:publish_at, :as => :date_picker))
         end
       )
-      output_buffer.should have_tag "input[maxlength='10']"
+      expect(output_buffer).to have_tag "input[maxlength='10']"
     end
 
     it "can be set from :input_html options" do
@@ -80,7 +80,7 @@ describe 'date_picker input' do
           concat(f.input(:publish_at, :as => :date_picker, :input_html => { :maxlength => "11" }))
         end
       )
-      output_buffer.should have_tag "input[maxlength='11']"
+      expect(output_buffer).to have_tag "input[maxlength='11']"
     end
     
     it "can be set from options (ignoring input_html)" do
@@ -89,7 +89,7 @@ describe 'date_picker input' do
           concat(f.input(:publish_at, :as => :date_picker, :maxlength => 12, :input_html => { :maxlength => "11" }))
         end
       )
-      output_buffer.should have_tag "input[maxlength='12']"
+      expect(output_buffer).to have_tag "input[maxlength='12']"
     end
     
   end
@@ -104,7 +104,7 @@ describe 'date_picker input' do
             concat(f.input(:publish_at, :as => :date_picker ))
           end
         )
-        output_buffer.should_not have_tag "li input[value]"
+        expect(output_buffer).not_to have_tag "li input[value]"
       end
       
       it "can be set from :input_html options" do
@@ -113,7 +113,7 @@ describe 'date_picker input' do
             concat(f.input(:publish_at, :as => :date_picker, :input_html => { :value => "1111-11-11" }))
           end
         )
-        output_buffer.should have_tag "input[value='1111-11-11']"
+        expect(output_buffer).to have_tag "input[value='1111-11-11']"
       end
       
     end
@@ -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)
+        allow(@new_post).to receive(:publish_at).and_return(@date)
       end
       
       it "renders the date as YYYY-MM-DD" do
@@ -131,7 +131,7 @@ describe 'date_picker input' do
             concat(f.input(:publish_at, :as => :date_picker ))
           end
         )
-        output_buffer.should have_tag "input[value='#{@date.to_s}']"
+        expect(output_buffer).to have_tag "input[value='#{@date.to_s}']"
       end
 
       it "can be set from :input_html options" do
@@ -140,7 +140,7 @@ describe 'date_picker input' do
             concat(f.input(:publish_at, :as => :date_picker, :input_html => { :value => "1111-11-11" }))
           end
         )
-        output_buffer.should have_tag "input[value='1111-11-11']"
+        expect(output_buffer).to have_tag "input[value='1111-11-11']"
       end
       
     end
@@ -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)
+        allow(@new_post).to receive(:publish_at).and_return(@time)
       end
       
       it "renders the time as a YYYY-MM-DD" do
@@ -158,7 +158,7 @@ describe 'date_picker input' do
             concat(f.input(:publish_at, :as => :date_picker ))
           end
         )
-        output_buffer.should have_tag "input[value='2000-11-11']"
+        expect(output_buffer).to have_tag "input[value='2000-11-11']"
       end
     
       it "can be set from :input_html options" do
@@ -167,7 +167,7 @@ describe 'date_picker input' do
             concat(f.input(:publish_at, :as => :date_picker, :input_html => { :value => "1111-11-11" }))
           end
         )
-        output_buffer.should have_tag "input[value='1111-11-11']"
+        expect(output_buffer).to have_tag "input[value='1111-11-11']"
       end
       
     end
@@ -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("")
+        allow(@new_post).to receive(:publish_at).and_return("")
       end
       
       it "will be empty" do
@@ -184,7 +184,7 @@ describe 'date_picker input' do
             concat(f.input(:publish_at, :as => :date_picker ))
           end
         )
-        output_buffer.should have_tag "input[value='']"
+        expect(output_buffer).to have_tag "input[value='']"
       end
       
       it "can be set from :input_html options" do
@@ -193,7 +193,7 @@ describe 'date_picker input' do
             concat(f.input(:publish_at, :as => :date_picker, :input_html => { :value => "1111-11-11" }))
           end
         )
-        output_buffer.should have_tag "input[value='1111-11-11']"
+        expect(output_buffer).to have_tag "input[value='1111-11-11']"
       end
       
     end
@@ -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")
+        allow(@new_post).to receive(:publish_at).and_return("yeah")
       end
       
       it "will be the string" do
@@ -210,7 +210,7 @@ describe 'date_picker input' do
             concat(f.input(:publish_at, :as => :date_picker ))
           end
         )
-        output_buffer.should have_tag "input[value='yeah']"
+        expect(output_buffer).to have_tag "input[value='yeah']"
       end
     
       it "can be set from :input_html options" do
@@ -219,7 +219,7 @@ describe 'date_picker input' do
             concat(f.input(:publish_at, :as => :date_picker, :input_html => { :value => "1111-11-11" }))
           end
         )
-        output_buffer.should have_tag "input[value='1111-11-11']"
+        expect(output_buffer).to have_tag "input[value='1111-11-11']"
       end
       
     end
@@ -234,7 +234,7 @@ describe 'date_picker input' do
           concat(f.input(:publish_at, :as => :date_picker))
         end
       )
-      output_buffer.should_not have_tag "input[min]"
+      expect(output_buffer).not_to have_tag "input[min]"
     end
     
     it "can be set from :input_html options" do
@@ -243,7 +243,7 @@ describe 'date_picker input' do
           concat(f.input(:publish_at, :as => :date_picker, :input_html => { :min => "1970-01-01" }))
         end
       )
-      output_buffer.should have_tag "input[min='1970-01-01']"
+      expect(output_buffer).to have_tag "input[min='1970-01-01']"
     end
     
   end
@@ -256,7 +256,7 @@ describe 'date_picker input' do
           concat(f.input(:publish_at, :as => :date_picker))
         end
       )
-      output_buffer.should_not have_tag "input[max]"
+      expect(output_buffer).not_to have_tag "input[max]"
     end
     
     it "can be set from :input_html options" do
@@ -265,7 +265,7 @@ describe 'date_picker input' do
           concat(f.input(:publish_at, :as => :date_picker, :input_html => { :max => "1970-01-01" }))
         end
       )
-      output_buffer.should have_tag "input[max='1970-01-01']"
+      expect(output_buffer).to have_tag "input[max='1970-01-01']"
     end
     
   end
@@ -278,7 +278,7 @@ describe 'date_picker input' do
           concat(f.input(:publish_at, :as => :date_picker))
         end
       )
-      output_buffer.should have_tag "input[step='1']"
+      expect(output_buffer).to have_tag "input[step='1']"
     end
 
     it "can be set from :input_html options" do
@@ -287,7 +287,7 @@ describe 'date_picker input' do
           concat(f.input(:publish_at, :as => :date_picker, :input_html => { :step => "5" }))
         end
       )
-      output_buffer.should have_tag "input[step='5']"
+      expect(output_buffer).to have_tag "input[step='5']"
     end
     
     describe "macros" do
@@ -303,49 +303,49 @@ describe 'date_picker input' do
       context ":day" do
         let(:step) { :day }
         it "uses 1" do
-          output_buffer.should have_tag "input[step='1']"
+          expect(output_buffer).to have_tag "input[step='1']"
         end
       end
       
       context ":seven_days" do
         let(:step) { :seven_days }
         it "uses 7" do
-          output_buffer.should have_tag "input[step='7']"
+          expect(output_buffer).to have_tag "input[step='7']"
         end
       end
       
       context ":week" do
         let(:step) { :week }
         it "uses 7" do
-          output_buffer.should have_tag "input[step='7']"
+          expect(output_buffer).to have_tag "input[step='7']"
         end
       end
       
       context ":fortnight" do
         let(:step) { :fortnight }
         it "uses 14" do
-          output_buffer.should have_tag "input[step='14']"
+          expect(output_buffer).to have_tag "input[step='14']"
         end
       end
       
       context ":two_weeks" do
         let(:step) { :two_weeks }
         it "uses 14" do
-          output_buffer.should have_tag "input[step='14']"
+          expect(output_buffer).to have_tag "input[step='14']"
         end
       end
       
       context ":four_weeks" do
         let(:step) { :four_weeks }
         it "uses 28" do
-          output_buffer.should have_tag "input[step='28']"
+          expect(output_buffer).to have_tag "input[step='28']"
         end
       end
       
       context ":thirty_days" do
         let(:step) { :thirty_days }
         it "uses 30" do
-          output_buffer.should have_tag "input[step='30']"
+          expect(output_buffer).to have_tag "input[step='30']"
         end
       end
       
@@ -361,7 +361,7 @@ describe 'date_picker input' do
           concat(f.input(:publish_at, :as => :date_picker))
         end
       )
-      output_buffer.should_not have_tag "input[placeholder]"
+      expect(output_buffer).not_to have_tag "input[placeholder]"
     end
     
     it "can be set from :input_html options" do
@@ -370,7 +370,7 @@ describe 'date_picker input' do
           concat(f.input(:publish_at, :as => :date_picker, :input_html => { :placeholder => "1970-01-01" }))
         end
       )
-      output_buffer.should have_tag "input[placeholder='1970-01-01']"
+      expect(output_buffer).to have_tag "input[placeholder='1970-01-01']"
     end
     
     context "with i18n set" do
@@ -383,7 +383,7 @@ describe 'date_picker input' do
           concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:publish_at, :as => :date_picker))
           end)
-          output_buffer.should have_tag('input[@placeholder="YYYY-MM-DD"]')
+          expect(output_buffer).to have_tag('input[@placeholder="YYYY-MM-DD"]')
         end
       end
       
@@ -392,7 +392,7 @@ describe 'date_picker input' do
           concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:publish_at, :as => :date_picker, :input_html => { :placeholder => "Something" }))
           end)
-          output_buffer.should have_tag('input[@placeholder="Something"]')
+          expect(output_buffer).to have_tag('input[@placeholder="Something"]')
         end
       end
     end
@@ -423,15 +423,15 @@ describe 'date_picker input' do
     end
     
     it 'should index the id of the wrapper' do
-      output_buffer.should have_tag("li#post_author_attributes_3_created_at_input")
+      expect(output_buffer).to have_tag("li#post_author_attributes_3_created_at_input")
     end
     
     it 'should index the id of the select tag' do
-      output_buffer.should have_tag("input#post_author_attributes_3_created_at")
+      expect(output_buffer).to have_tag("input#post_author_attributes_3_created_at")
     end
     
     it 'should index the name of the select tag' do
-      output_buffer.should have_tag("input[@name='post[author_attributes][3][created_at]']")
+      expect(output_buffer).to have_tag("input[@name='post[author_attributes][3][created_at]']")
     end
   end
   
@@ -441,7 +441,7 @@ describe 'date_picker input' do
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:publish_at, :as => :date_picker, :required => true))
         end)
-        output_buffer.should have_tag("input[@required]")
+        expect(output_buffer).to have_tag("input[@required]")
       end
     end
   end