formtastic 3.1.1 → 4.0.0.rc1

data/spec/inputs/datetime_select_input_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe 'datetime select input' do
+RSpec.describe 'datetime select input' do
 
   include FormtasticSpecHelper
 
@@ -29,32 +29,32 @@ describe 'datetime select input' do
     it_should_apply_error_logic_for_input_type(:datetime_select)
     
     it 'should have a legend and label with the label text inside the fieldset' do
-      output_buffer.should have_tag('form li.datetime_select fieldset legend.label label', /Publish at/)
+      expect(output_buffer).to have_tag('form li.datetime_select fieldset legend.label label', :text => /Publish at/)
     end
     
     it 'should associate the legend label with the first select' do
-      output_buffer.should have_tag('form li.datetime_select fieldset legend.label')
-      output_buffer.should have_tag('form li.datetime_select fieldset legend.label label')
-      output_buffer.should have_tag('form li.datetime_select fieldset legend.label label[@for]')
-      output_buffer.should have_tag('form li.datetime_select fieldset legend.label label[@for="post_publish_at_1i"]')
+      expect(output_buffer).to have_tag('form li.datetime_select fieldset legend.label')
+      expect(output_buffer).to have_tag('form li.datetime_select fieldset legend.label label')
+      expect(output_buffer).to have_tag('form li.datetime_select fieldset legend.label label[@for]')
+      expect(output_buffer).to have_tag('form li.datetime_select fieldset legend.label label[@for="post_publish_at_1i"]')
     end
     
     it 'should have an ordered list of five items inside the fieldset' do
-      output_buffer.should have_tag('form li.datetime_select fieldset ol.fragments-group')
-      output_buffer.should have_tag('form li.datetime_select fieldset ol li.fragment', :count => 5)
+      expect(output_buffer).to have_tag('form li.datetime_select fieldset ol.fragments-group')
+      expect(output_buffer).to have_tag('form li.datetime_select fieldset ol li.fragment', :count => 5)
     end
 
     it 'should have five labels for year, month and day' do
-      output_buffer.should have_tag('form li.datetime_select fieldset ol li label', :count => 5)
-      output_buffer.should have_tag('form li.datetime_select fieldset ol li label', /year/i)
-      output_buffer.should have_tag('form li.datetime_select fieldset ol li label', /month/i)
-      output_buffer.should have_tag('form li.datetime_select fieldset ol li label', /day/i)
-      output_buffer.should have_tag('form li.datetime_select fieldset ol li label', /hour/i)
-      output_buffer.should have_tag('form li.datetime_select fieldset ol li label', /min/i)
+      expect(output_buffer).to have_tag('form li.datetime_select fieldset ol li label', :count => 5)
+      expect(output_buffer).to have_tag('form li.datetime_select fieldset ol li label', :text => /year/i)
+      expect(output_buffer).to have_tag('form li.datetime_select fieldset ol li label', :text => /month/i)
+      expect(output_buffer).to have_tag('form li.datetime_select fieldset ol li label', :text => /day/i)
+      expect(output_buffer).to have_tag('form li.datetime_select fieldset ol li label', :text => /hour/i)
+      expect(output_buffer).to have_tag('form li.datetime_select fieldset ol li label', :text => /min/i)
     end
     
     it 'should have five selects' do
-      output_buffer.should have_tag('form li.datetime_select fieldset ol li select', :count => 5)
+      expect(output_buffer).to have_tag('form li.datetime_select fieldset ol li select', :count => 5)
     end
   end
 
@@ -90,23 +90,23 @@ describe 'datetime select 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("select#post_author_attributes_3_created_at_1i")
-      output_buffer.should have_tag("select#post_author_attributes_3_created_at_2i")
-      output_buffer.should have_tag("select#post_author_attributes_3_created_at_3i")
-      output_buffer.should have_tag("select#post_author_attributes_3_created_at_4i")
-      output_buffer.should have_tag("select#post_author_attributes_3_created_at_5i")
+      expect(output_buffer).to have_tag("select#post_author_attributes_3_created_at_1i")
+      expect(output_buffer).to have_tag("select#post_author_attributes_3_created_at_2i")
+      expect(output_buffer).to have_tag("select#post_author_attributes_3_created_at_3i")
+      expect(output_buffer).to have_tag("select#post_author_attributes_3_created_at_4i")
+      expect(output_buffer).to have_tag("select#post_author_attributes_3_created_at_5i")
     end
     
     it 'should index the name of the select tag' do
-      output_buffer.should have_tag("select[@name='post[author_attributes][3][created_at(1i)]']")
-      output_buffer.should have_tag("select[@name='post[author_attributes][3][created_at(2i)]']")
-      output_buffer.should have_tag("select[@name='post[author_attributes][3][created_at(3i)]']")
-      output_buffer.should have_tag("select[@name='post[author_attributes][3][created_at(4i)]']")
-      output_buffer.should have_tag("select[@name='post[author_attributes][3][created_at(5i)]']")
+      expect(output_buffer).to have_tag("select[@name='post[author_attributes][3][created_at(1i)]']")
+      expect(output_buffer).to have_tag("select[@name='post[author_attributes][3][created_at(2i)]']")
+      expect(output_buffer).to have_tag("select[@name='post[author_attributes][3][created_at(3i)]']")
+      expect(output_buffer).to have_tag("select[@name='post[author_attributes][3][created_at(4i)]']")
+      expect(output_buffer).to have_tag("select[@name='post[author_attributes][3][created_at(5i)]']")
     end
     
   end
@@ -120,9 +120,9 @@ describe 'datetime select input' do
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :datetime_select, :labels => { field => "another #{field} label" }))
         end)
-        output_buffer.should have_tag('form li.datetime_select fieldset ol li label', :count => fields.length)
+        expect(output_buffer).to have_tag('form li.datetime_select fieldset ol li label', :count => fields.length)
         fields.each do |f|
-          output_buffer.should have_tag('form li.datetime_select fieldset ol li label', f == field ? /another #{f} label/i : /#{f}/i)
+          expect(output_buffer).to have_tag('form li.datetime_select fieldset ol li label', :text => f == field ? /another #{f} label/i : /#{f}/i)
         end
       end
       
@@ -131,9 +131,9 @@ describe 'datetime select input' do
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :datetime_select, :labels => { field => "" }))
         end)
-        output_buffer.should have_tag('form li.datetime_select fieldset ol li label', :count => fields.length-1)
+        expect(output_buffer).to have_tag('form li.datetime_select fieldset ol li label', :count => fields.length-1)
         fields.each do |f|
-          output_buffer.should have_tag('form li.datetime_select fieldset ol li label', /#{f}/i) unless field == f
+          expect(output_buffer).to have_tag('form li.datetime_select fieldset ol li label', :text => /#{f}/i) unless field == f
         end
       end
       
@@ -142,9 +142,9 @@ describe 'datetime select input' do
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :datetime_select, :labels => { field => false }))
         end)
-        output_buffer.should have_tag('form li.datetime_select fieldset ol li label', :count => fields.length-1)
+        expect(output_buffer).to have_tag('form li.datetime_select fieldset ol li label', :count => fields.length-1)
         fields.each do |f|
-          output_buffer.should have_tag('form li.datetime_select fieldset ol li label', /#{f}/i) unless field == f
+          expect(output_buffer).to have_tag('form li.datetime_select fieldset ol li label', :text => /#{f}/i) unless field == f
         end
       end
       
@@ -153,7 +153,7 @@ describe 'datetime select input' do
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :datetime_select, :include_seconds => true, :labels => { field => false }))
         end)
-        output_buffer.should_not include(">")
+        expect(output_buffer).not_to include(">")
       end
     end
 
@@ -162,17 +162,33 @@ describe 'datetime select input' do
       concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:created_at, :as => :datetime_select, :labels => false))
       end)
-      output_buffer.should have_tag('form li.datetime_select fieldset ol li label', :count => 0)
+      expect(output_buffer).to have_tag('form li.datetime_select fieldset ol li label', :count => 0)
     end
   end
-  
+
+  describe ":selected option for setting a value" do
+    it "should set the selected value for the form" do
+      concat(
+        semantic_form_for(@new_post) do |f|
+          concat(f.input(:created_at, :as => :datetime_select, :selected => DateTime.new(2018, 10, 4, 12, 00)))
+        end
+      )
+
+      expect(output_buffer).to have_tag "option[value='2018'][selected='selected']"
+      expect(output_buffer).to have_tag "option[value='10'][selected='selected']"
+      expect(output_buffer).to have_tag "option[value='4'][selected='selected']"
+      expect(output_buffer).to have_tag "option[value='12'][selected='selected']"
+      expect(output_buffer).to have_tag "option[value='00'][selected='selected']"
+    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 => :datetime_select, :required => true))
         end)
-        output_buffer.should have_tag("select[@required]", :count => 5)
+        expect(output_buffer).to have_tag("select[@required]", :count => 5)
       end
     end
   end
@@ -186,7 +202,7 @@ describe 'datetime select input' do
     end
 
     it 'should associate the legend label with the new first select' do
-      output_buffer.should have_tag('form li.datetime_select fieldset legend.label label[@for="post_publish_at_3i"]')
+      expect(output_buffer).to have_tag('form li.datetime_select fieldset legend.label label[@for="post_publish_at_3i"]')
     end
   end
   

data/spec/inputs/email_input_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe 'email input' do
+RSpec.describe 'email input' do
 
   include FormtasticSpecHelper
 
@@ -56,15 +56,15 @@ describe 'email input' do
     end
     
     it 'should index the id of the wrapper' do
-      output_buffer.should have_tag("li#post_author_attributes_3_name_input")
+      expect(output_buffer).to have_tag("li#post_author_attributes_3_name_input")
     end
     
     it 'should index the id of the select tag' do
-      output_buffer.should have_tag("input#post_author_attributes_3_name")
+      expect(output_buffer).to have_tag("input#post_author_attributes_3_name")
     end
     
     it 'should index the name of the select tag' do
-      output_buffer.should have_tag("input[@name='post[author_attributes][3][name]']")
+      expect(output_buffer).to have_tag("input[@name='post[author_attributes][3][name]']")
     end
     
   end
@@ -76,7 +76,7 @@ describe 'email input' do
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => :email, :required => true))
         end)
-        output_buffer.should have_tag("input[@required]")
+        expect(output_buffer).to have_tag("input[@required]")
       end
     end
   end

data/spec/inputs/file_input_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe 'file input' do
+RSpec.describe 'file input' do
 
   include FormtasticSpecHelper
 
@@ -27,7 +27,7 @@ describe 'file input' do
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :file, :input_html => { :class => 'myclass' }))
     end)
-    output_buffer.should have_tag("form li input.myclass")
+    expect(output_buffer).to have_tag("form li input.myclass")
   end
 
   describe "when namespace is provided" do
@@ -60,15 +60,15 @@ describe 'file input' do
     end
     
     it 'should index the id of the wrapper' do
-      output_buffer.should have_tag("li#post_author_attributes_3_name_input")
+      expect(output_buffer).to have_tag("li#post_author_attributes_3_name_input")
     end
     
     it 'should index the id of the select tag' do
-      output_buffer.should have_tag("input#post_author_attributes_3_name")
+      expect(output_buffer).to have_tag("input#post_author_attributes_3_name")
     end
     
     it 'should index the name of the select tag' do
-      output_buffer.should have_tag("input[@name='post[author_attributes][3][name]']")
+      expect(output_buffer).to have_tag("input[@name='post[author_attributes][3][name]']")
     end
     
   end
@@ -80,7 +80,7 @@ describe 'file input' do
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => :file, :required => true))
         end)
-        output_buffer.should have_tag("input[@required]")
+        expect(output_buffer).to have_tag("input[@required]")
       end
     end
   end

data/spec/inputs/hidden_input_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe 'hidden input' do
+RSpec.describe 'hidden input' do
 
   include FormtasticSpecHelper
 
@@ -22,34 +22,34 @@ describe 'hidden input' do
   it_should_not_have_a_label
 
   it "should generate a input field" do
-    output_buffer.should have_tag("form li input#post_secret")
-    output_buffer.should have_tag("form li input#post_secret[@type=\"hidden\"]")
-    output_buffer.should have_tag("form li input#post_secret[@name=\"post[secret]\"]")
+    expect(output_buffer).to have_tag("form li input#post_secret")
+    expect(output_buffer).to have_tag("form li input#post_secret[@type=\"hidden\"]")
+    expect(output_buffer).to have_tag("form li input#post_secret[@name=\"post[secret]\"]")
   end
 
   it "should get value from the object" do
-    output_buffer.should have_tag("form li input#post_secret[@type=\"hidden\"][@value=\"1\"]")
+    expect(output_buffer).to have_tag("form li input#post_secret[@type=\"hidden\"][@value=\"1\"]")
   end
   
   it "should pass any explicitly specified value - using :input_html options" do
-    output_buffer.should have_tag("form li input#post_published[@type=\"hidden\"][@value=\"true\"]")
+    expect(output_buffer).to have_tag("form li input#post_published[@type=\"hidden\"][@value=\"true\"]")
   end
 
   it "should pass any option specified using :input_html" do
-    output_buffer.should have_tag("form li input#new_post_reviewer[@type=\"hidden\"][@class=\"new_post_reviewer\"]")
+    expect(output_buffer).to have_tag("form li input#new_post_reviewer[@type=\"hidden\"][@class=\"new_post_reviewer\"]")
   end
 
   it "should not render inline errors" do
     @errors = double('errors')
-    @errors.stub(:[]).with(errors_matcher(:secret)).and_return(["foo", "bah"])
-    @new_post.stub(:errors).and_return(@errors)
+    allow(@errors).to receive(:[]).with(errors_matcher(:secret)).and_return(["foo", "bah"])
+    allow(@new_post).to receive(:errors).and_return(@errors)
 
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:secret, :as => :hidden))
     end)
 
-    output_buffer.should_not have_tag("form li p.inline-errors")
-    output_buffer.should_not have_tag("form li ul.errors")
+    expect(output_buffer).not_to have_tag("form li p.inline-errors")
+    expect(output_buffer).not_to have_tag("form li ul.errors")
   end
 
   it "should not render inline hints" do
@@ -57,8 +57,8 @@ describe 'hidden input' do
       concat(builder.input(:secret, :as => :hidden, :hint => "all your base are belong to use"))
     end)
 
-    output_buffer.should_not have_tag("form li p.inline-hints")
-    output_buffer.should_not have_tag("form li ul.hints")
+    expect(output_buffer).not_to have_tag("form li p.inline-hints")
+    expect(output_buffer).not_to have_tag("form li ul.hints")
   end
 
   describe "when namespace is provided" do
@@ -99,15 +99,15 @@ describe 'hidden input' do
     end
     
     it 'should index the id of the wrapper' do
-      output_buffer.should have_tag("li#post_author_attributes_3_name_input")
+      expect(output_buffer).to have_tag("li#post_author_attributes_3_name_input")
     end
     
     it 'should index the id of the select tag' do
-      output_buffer.should have_tag("input#post_author_attributes_3_name")
+      expect(output_buffer).to have_tag("input#post_author_attributes_3_name")
     end
     
     it 'should index the name of the select tag' do
-      output_buffer.should have_tag("input[@name='post[author_attributes][3][name]']")
+      expect(output_buffer).to have_tag("input[@name='post[author_attributes][3][name]']")
     end
     
   end
@@ -118,7 +118,7 @@ describe 'hidden input' do
       concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:title, :as => :hidden, :required => true))
       end)
-      output_buffer.should_not have_tag("input[@required]")
+      expect(output_buffer).not_to have_tag("input[@required]")
     end
   end
 
@@ -127,7 +127,7 @@ describe 'hidden input' do
       concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:title, :as => :hidden, :input_html => {:autofocus => true}))
       end)
-      output_buffer.should_not have_tag("input[@autofocus]")
+      expect(output_buffer).not_to have_tag("input[@autofocus]")
     end
   end
 

data/spec/inputs/include_blank_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe "*select: options[:include_blank]" do
+RSpec.describe "*select: options[:include_blank]" do
 
   include FormtasticSpecHelper
 
@@ -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)
+    allow(@new_post).to receive(:author_id).and_return(nil)
+    allow(@new_post).to receive(:publish_at).and_return(nil)
   end
 
   SELECT_INPUT_TYPES = {
@@ -29,7 +29,7 @@ describe "*select: options[:include_blank]" do
           concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(attribute, :as => as))
           end)
-          output_buffer.should have_tag("form li select option[@value='']", "")
+          expect(output_buffer).to have_tag("form li select option[@value='']", "")
         end
 
         it 'blank value should not be included if the default value specified in config is false' do
@@ -37,7 +37,7 @@ describe "*select: options[:include_blank]" do
           concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(attribute, :as => as))
           end)
-          output_buffer.should_not have_tag("form li select option[@value='']", "")
+          expect(output_buffer).not_to have_tag("form li select option[@value='']", "")
         end
 
         after do
@@ -50,7 +50,7 @@ describe "*select: options[:include_blank]" do
           concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(attribute, :as => as, :include_blank => false))
           end)
-          output_buffer.should_not have_tag("form li select option[@value='']", "")
+          expect(output_buffer).not_to have_tag("form li select option[@value='']", "")
         end
       end
 
@@ -59,7 +59,7 @@ describe "*select: options[:include_blank]" do
           concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(attribute, :as => as, :include_blank => true))
           end)
-          output_buffer.should have_tag("form li select option[@value='']", "")
+          expect(output_buffer).to have_tag("form li select option[@value='']", "")
         end
       end
 
@@ -69,7 +69,7 @@ describe "*select: options[:include_blank]" do
             concat(semantic_form_for(@new_post) do |builder|
               concat(builder.input(attribute, :as => as, :include_blank => 'string'))
             end)
-            output_buffer.should have_tag("form li select option[@value='']", "string")
+            expect(output_buffer).to have_tag("form li select option[@value='']", "string")
           end
         end
       end

data/spec/inputs/label_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe 'Formtastic::FormBuilder#label' do
+RSpec.describe 'Formtastic::FormBuilder#label' do
 
   include FormtasticSpecHelper
 
@@ -28,7 +28,7 @@ describe 'Formtastic::FormBuilder#label' do
       ::I18n.backend.store_translations :en, { :formtastic => { :labels => { :post => { :title => nil } } } }
       Formtastic::FormBuilder.required_string = default_required_str
 
-      output_buffer.scan(required_string).count.should == 1
+      expect(output_buffer.scan(required_string).count).to eq(1)
     end
   end
 
@@ -36,7 +36,7 @@ describe 'Formtastic::FormBuilder#label' do
     concat(semantic_form_for(@new_post) do |builder|
       builder.input(:title)
     end)
-    output_buffer.should have_tag('label', /Title/)
+    expect(output_buffer).to have_tag('label', :text => /Title/)
   end
   
   it 'should use i18n instead of the method name when method given as a String' do
@@ -46,7 +46,7 @@ describe 'Formtastic::FormBuilder#label' do
         builder.input("title")
       end)
       ::I18n.backend.store_translations :en, { :formtastic => { :labels => { :post => { :title => nil } } } }
-      output_buffer.should have_tag('label', /I18n title/)
+      expect(output_buffer).to have_tag('label', :text => /I18n title/)
     end
   end
 
@@ -54,7 +54,7 @@ describe 'Formtastic::FormBuilder#label' do
     concat(semantic_form_for(@new_post) do |builder|
       builder.input(:publish_at)
     end)
-    output_buffer.should have_tag('label', /Publish at/)
+    expect(output_buffer).to have_tag('label', :text => /Publish at/)
   end
 
   describe 'when required is given' do
@@ -62,7 +62,7 @@ describe 'Formtastic::FormBuilder#label' do
       concat(semantic_form_for(@new_post) do |builder|
         builder.input(:title, :required => true)
       end)
-      output_buffer.should have_tag('label abbr', '*')
+      expect(output_buffer).to have_tag('label abbr', '*')
     end
   end
 
@@ -73,7 +73,7 @@ describe 'Formtastic::FormBuilder#label' do
           concat(builder.input(:author_id, :as => :check_boxes, :collection => [:a, :b, :c], :member_value => :to_s, :member_label => proc {|f| ('Label_%s' % [f])}))
         end)
       end
-      output_buffer.should have_tag('form li fieldset ol li label', /Label_[abc]/, :count => 3)
+      expect(output_buffer).to have_tag('form li fieldset ol li label', :text => /Label_[abc]/, :count => 3)
     end
 
     it 'should use a supplied value_method for simple collections' do
@@ -82,9 +82,9 @@ describe 'Formtastic::FormBuilder#label' do
           concat(builder.input(:author_id, :as => :check_boxes, :collection => [:a, :b, :c], :member_value => proc {|f| ('Value_%s' % [f.to_s])}))
         end)
       end
-      output_buffer.should have_tag('form li fieldset ol li label input[value="Value_a"]')
-      output_buffer.should have_tag('form li fieldset ol li label input[value="Value_b"]')
-      output_buffer.should have_tag('form li fieldset ol li label input[value="Value_c"]')
+      expect(output_buffer).to have_tag('form li fieldset ol li label input[value="Value_a"]')
+      expect(output_buffer).to have_tag('form li fieldset ol li label input[value="Value_b"]')
+      expect(output_buffer).to have_tag('form li fieldset ol li label input[value="Value_c"]')
     end
   end
 
@@ -93,38 +93,38 @@ describe 'Formtastic::FormBuilder#label' do
       concat(semantic_form_for(@new_post) do |builder|
         builder.input(:title, :label => 'My label')
       end)
-      output_buffer.should have_tag('label', /My label/)
+      expect(output_buffer).to have_tag('label', :text => /My label/)
     end
     
     it 'should allow the text to be given as label option for date fields' do
       concat(semantic_form_for(@new_post) do |builder|
         builder.input(:publish_at, :label => 'My other label')
       end)
-      output_buffer.should have_tag('label', /My other label/)
+      expect(output_buffer).to have_tag('label', :text => /My other label/)
     end
 
     it 'should return nil if label is false' do
       concat(semantic_form_for(@new_post) do |builder|
         builder.input(:title, :label => false)
       end)
-      output_buffer.should_not have_tag('label')
-      output_buffer.should_not include(">")
+      expect(output_buffer).not_to have_tag('label')
+      expect(output_buffer).not_to include(">")
     end
     
     it 'should return nil if label is false for timeish fragments' do
       concat(semantic_form_for(@new_post) do |builder|
         builder.input(:title, :as => :time_select, :label => false)
       end)
-      output_buffer.should_not have_tag('li.time > label')
-      output_buffer.should_not include(">")
+      expect(output_buffer).not_to have_tag('li.time > label')
+      expect(output_buffer).not_to include(">")
     end
 
     it 'should html escape the label string by default' do
       concat(semantic_form_for(@new_post) do |builder|
         builder.input(:title, :label => '<b>My label</b>')
       end)
-      output_buffer.should include('&lt;b&gt;')
-      output_buffer.should_not include('<b>')
+      expect(output_buffer).to include('&lt;b&gt;')
+      expect(output_buffer).not_to include('<b>')
     end
 
     it 'should not html escape the label if configured that way' do
@@ -132,7 +132,7 @@ describe 'Formtastic::FormBuilder#label' do
       concat(semantic_form_for(@new_post) do |builder|
         builder.input(:title, :label => '<b>My label</b>')
       end)
-      output_buffer.should have_tag("label b", "My label")
+      expect(output_buffer).to have_tag("label b", :text => "My label")
     end
 
     it 'should not html escape the label string for html_safe strings' do
@@ -140,7 +140,7 @@ describe 'Formtastic::FormBuilder#label' do
       concat(semantic_form_for(@new_post) do |builder|
         builder.input(:title, :label => '<b>My label</b>'.html_safe)
       end)
-      output_buffer.should have_tag('label b')
+      expect(output_buffer).to have_tag('label b')
     end
 
   end