formtastic 3.1.2 → 4.0.0

data/spec/actions/generic_action_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe 'InputAction::Base' do
+RSpec.describe 'InputAction::Base' do
   
   # Most basic Action class to test Base
   class ::GenericAction
@@ -36,15 +36,15 @@ describe 'InputAction::Base' do
     end
     
     it 'should add the #foo id to the li' do
-      output_buffer.should have_tag('li#post_submit_action')
+      expect(output_buffer).to have_tag('li#post_submit_action')
     end
     
     it 'should add the .action and .generic_action classes to the li' do
-      output_buffer.should have_tag('li.action.generic_action')
+      expect(output_buffer).to have_tag('li.action.generic_action')
     end
 
     it 'should pass :wrapper_html HTML attributes to the wrapper' do
-      output_buffer.should have_tag('li.action.generic_action[@foo="bah"]')
+      expect(output_buffer).to have_tag('li.action.generic_action[@foo="bah"]')
     end
     
     context "when a custom :id is provided" do
@@ -58,7 +58,7 @@ describe 'InputAction::Base' do
       end
       
       it "should use the custom id" do
-        output_buffer.should have_tag('li#foo_bah_bing')
+        expect(output_buffer).to have_tag('li#foo_bah_bing')
       end
       
     end
@@ -74,7 +74,7 @@ describe 'InputAction::Base' do
       end
       
       it "should add the custom class strng to the existing classes" do
-        output_buffer.should have_tag('li.action.generic_action.foo_bah_bing')
+        expect(output_buffer).to have_tag('li.action.generic_action.foo_bah_bing')
       end
       
     end
@@ -90,7 +90,7 @@ describe 'InputAction::Base' do
       end
       
       it "should add the custom class strng to the existing classes" do
-        output_buffer.should have_tag('li.action.generic_action.foo_bah_bing.zing_boo')
+        expect(output_buffer).to have_tag('li.action.generic_action.foo_bah_bing.zing_boo')
       end
       
     end
@@ -108,7 +108,7 @@ describe 'InputAction::Base' do
     end
     
     it 'should pass :button_html HTML attributes to the button' do
-      output_buffer.should have_tag('li.action.generic_action input[@foo="bah"]')
+      expect(output_buffer).to have_tag('li.action.generic_action input[@foo="bah"]')
     end
     
     it 'should respect a default_commit_button_accesskey configuration with nil' do
@@ -116,7 +116,7 @@ describe 'InputAction::Base' do
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.action(:submit, :as => :generic))
         end)
-        output_buffer.should_not have_tag('li.action input[@accesskey]')
+        expect(output_buffer).not_to have_tag('li.action input[@accesskey]')
       end
     end
     
@@ -125,7 +125,7 @@ describe 'InputAction::Base' do
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.action(:submit, :as => :generic))
         end)
-        output_buffer.should have_tag('li.action input[@accesskey="s"]')
+        expect(output_buffer).to have_tag('li.action input[@accesskey="s"]')
       end
     end
     
@@ -134,8 +134,8 @@ describe 'InputAction::Base' do
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.action(:submit, :as => :generic, :accesskey => 'o'))
         end)
-        output_buffer.should_not have_tag('li.action input[@accesskey="s"]')
-        output_buffer.should have_tag('li.action input[@accesskey="o"]')
+        expect(output_buffer).not_to have_tag('li.action input[@accesskey="s"]')
+        expect(output_buffer).to have_tag('li.action input[@accesskey="o"]')
       end
     end
     
@@ -152,9 +152,9 @@ describe 'InputAction::Base' do
             concat(builder.action(:reset,  :as => :generic, :label => "Reset!"))
             concat(builder.action(:cancel, :as => :generic, :label => "Cancel!"))
           end)
-          output_buffer.should have_tag('li.generic_action input[@value="Click!"]')
-          output_buffer.should have_tag('li.generic_action input[@value="Reset!"]')
-          output_buffer.should have_tag('li.generic_action input[@value="Cancel!"]')
+          expect(output_buffer).to have_tag('li.generic_action input[@value="Click!"]')
+          expect(output_buffer).to have_tag('li.generic_action input[@value="Reset!"]')
+          expect(output_buffer).to have_tag('li.generic_action input[@value="Cancel!"]')
         end
       end
   
@@ -185,9 +185,9 @@ describe 'InputAction::Base' do
               concat(builder.action(:reset, :as => :generic))
               concat(builder.action(:cancel, :as => :generic))
             end)
-            output_buffer.should have_tag('li.generic_action input[@value="Submit Post"]')
-            output_buffer.should have_tag('li.generic_action input[@value="Cancel Post"]')
-            output_buffer.should have_tag('li.generic_action input[@value="Reset Post"]')
+            expect(output_buffer).to have_tag('li.generic_action input[@value="Submit Post"]')
+            expect(output_buffer).to have_tag('li.generic_action input[@value="Cancel Post"]')
+            expect(output_buffer).to have_tag('li.generic_action input[@value="Reset Post"]')
           end
 
           it 'should render an input with custom resource name localized label' do
@@ -196,9 +196,9 @@ describe 'InputAction::Base' do
               concat(builder.action(:reset, :as => :generic))
               concat(builder.action(:cancel, :as => :generic))
             end)
-            output_buffer.should have_tag('li.generic_action input[@value="Submit message"]')
-            output_buffer.should have_tag('li.generic_action input[@value="Cancel message"]')
-            output_buffer.should have_tag('li.generic_action input[@value="Reset message"]')
+            expect(output_buffer).to have_tag('li.generic_action input[@value="Submit message"]')
+            expect(output_buffer).to have_tag('li.generic_action input[@value="Cancel message"]')
+            expect(output_buffer).to have_tag('li.generic_action input[@value="Reset message"]')
           end
         end
   
@@ -237,9 +237,9 @@ describe 'InputAction::Base' do
                concat(builder.action(:reset, :as => :generic))
                concat(builder.action(:cancel, :as => :generic))
              end)
-             output_buffer.should have_tag(%Q{li.generic_action input[@value="Custom Submit Post"]})
-             output_buffer.should have_tag(%Q{li.generic_action input[@value="Custom Reset Post"]})
-             output_buffer.should have_tag(%Q{li.generic_action input[@value="Custom Cancel Post"]})
+             expect(output_buffer).to have_tag(%Q{li.generic_action input[@value="Custom Submit Post"]})
+             expect(output_buffer).to have_tag(%Q{li.generic_action input[@value="Custom Reset Post"]})
+             expect(output_buffer).to have_tag(%Q{li.generic_action input[@value="Custom Cancel Post"]})
            end
          end
   
@@ -250,9 +250,9 @@ describe 'InputAction::Base' do
                concat(builder.action(:reset, :as => :generic))
                concat(builder.action(:cancel, :as => :generic))
              end)
-             output_buffer.should have_tag(%Q{li.generic_action input[@value="Custom Submit"]})
-             output_buffer.should have_tag(%Q{li.generic_action input[@value="Custom Reset"]})
-             output_buffer.should have_tag(%Q{li.generic_action input[@value="Custom Cancel"]})
+             expect(output_buffer).to have_tag(%Q{li.generic_action input[@value="Custom Submit"]})
+             expect(output_buffer).to have_tag(%Q{li.generic_action input[@value="Custom Reset"]})
+             expect(output_buffer).to have_tag(%Q{li.generic_action input[@value="Custom Cancel"]})
            end
          end
   
@@ -262,7 +262,7 @@ describe 'InputAction::Base' do
   
     describe 'when used on a new record' do
       before do
-        @new_post.stub(:new_record?).and_return(true)
+        allow(@new_post).to receive(:new_record?).and_return(true)
       end
   
       describe 'when explicit label is provided' do
@@ -272,9 +272,9 @@ describe 'InputAction::Base' do
             concat(builder.action(:reset, :as => :generic, :label => "Reset!"))
             concat(builder.action(:cancel, :as => :generic, :label => "Cancel!"))
           end)
-          output_buffer.should have_tag('li.generic_action input[@value="Click!"]')
-          output_buffer.should have_tag('li.generic_action input[@value="Reset!"]')
-          output_buffer.should have_tag('li.generic_action input[@value="Cancel!"]')
+          expect(output_buffer).to have_tag('li.generic_action input[@value="Click!"]')
+          expect(output_buffer).to have_tag('li.generic_action input[@value="Reset!"]')
+          expect(output_buffer).to have_tag('li.generic_action input[@value="Cancel!"]')
         end
       end
   
@@ -298,9 +298,9 @@ describe 'InputAction::Base' do
               concat(builder.action(:reset,  :as => :generic))
               concat(builder.action(:cancel,  :as => :generic))
             end)
-            output_buffer.should have_tag('li.generic_action input[@value="Create Post"]')
-            output_buffer.should have_tag('li.generic_action input[@value="Reset Post"]')
-            output_buffer.should have_tag('li.generic_action input[@value="Cancel Post"]')
+            expect(output_buffer).to have_tag('li.generic_action input[@value="Create Post"]')
+            expect(output_buffer).to have_tag('li.generic_action input[@value="Reset Post"]')
+            expect(output_buffer).to have_tag('li.generic_action input[@value="Cancel Post"]')
           end
         end
   
@@ -337,9 +337,9 @@ describe 'InputAction::Base' do
                 concat(builder.action(:reset, :as => :generic))
                 concat(builder.action(:cancel, :as => :generic))
               end)
-              output_buffer.should have_tag(%Q{li.generic_action input[@value="Custom Create Post"]})
-              output_buffer.should have_tag(%Q{li.generic_action input[@value="Custom Reset Post"]})
-              output_buffer.should have_tag(%Q{li.generic_action input[@value="Custom Cancel Post"]})
+              expect(output_buffer).to have_tag(%Q{li.generic_action input[@value="Custom Create Post"]})
+              expect(output_buffer).to have_tag(%Q{li.generic_action input[@value="Custom Reset Post"]})
+              expect(output_buffer).to have_tag(%Q{li.generic_action input[@value="Custom Cancel Post"]})
             end
           end
   
@@ -350,9 +350,9 @@ describe 'InputAction::Base' do
                 concat(builder.action(:reset, :as => :generic))
                 concat(builder.action(:cancel, :as => :generic))
               end)
-              output_buffer.should have_tag(%Q{li.generic_action input[@value="Custom Create"]})
-              output_buffer.should have_tag(%Q{li.generic_action input[@value="Custom Reset"]})
-              output_buffer.should have_tag(%Q{li.generic_action input[@value="Custom Cancel"]})
+              expect(output_buffer).to have_tag(%Q{li.generic_action input[@value="Custom Create"]})
+              expect(output_buffer).to have_tag(%Q{li.generic_action input[@value="Custom Reset"]})
+              expect(output_buffer).to have_tag(%Q{li.generic_action input[@value="Custom Cancel"]})
             end
           end
   
@@ -362,7 +362,7 @@ describe 'InputAction::Base' do
   
     describe 'when used on an existing record' do
       before do
-        @new_post.stub(:persisted?).and_return(true)
+        allow(@new_post).to receive(:persisted?).and_return(true)
       end
   
       describe 'when explicit label is provided' do
@@ -372,9 +372,9 @@ describe 'InputAction::Base' do
             concat(builder.action(:reset, :as => :generic, :label => "Reset!"))
             concat(builder.action(:cancel, :as => :generic, :label => "Cancel!"))
           end)
-          output_buffer.should have_tag('li.generic_action input[@value="Click!"]')
-          output_buffer.should have_tag('li.generic_action input[@value="Reset!"]')
-          output_buffer.should have_tag('li.generic_action input[@value="Cancel!"]')
+          expect(output_buffer).to have_tag('li.generic_action input[@value="Click!"]')
+          expect(output_buffer).to have_tag('li.generic_action input[@value="Reset!"]')
+          expect(output_buffer).to have_tag('li.generic_action input[@value="Cancel!"]')
         end
       end
   
@@ -405,9 +405,9 @@ describe 'InputAction::Base' do
               concat(builder.action(:reset, :as => :generic))
               concat(builder.action(:cancel, :as => :generic))
             end)
-            output_buffer.should have_tag('li.generic_action input[@value="Save Post"]')
-            output_buffer.should have_tag('li.generic_action input[@value="Reset Post"]')
-            output_buffer.should have_tag('li.generic_action input[@value="Cancel Post"]')
+            expect(output_buffer).to have_tag('li.generic_action input[@value="Save Post"]')
+            expect(output_buffer).to have_tag('li.generic_action input[@value="Reset Post"]')
+            expect(output_buffer).to have_tag('li.generic_action input[@value="Cancel Post"]')
           end
 
           it 'should render an input with custom resource name localized label' do
@@ -416,9 +416,9 @@ describe 'InputAction::Base' do
               concat(builder.action(:reset, :as => :generic))
               concat(builder.action(:cancel, :as => :generic))
             end)
-            output_buffer.should have_tag('li.generic_action input[@value="Submit message"]')
-            output_buffer.should have_tag('li.generic_action input[@value="Cancel message"]')
-            output_buffer.should have_tag('li.generic_action input[@value="Reset message"]')
+            expect(output_buffer).to have_tag('li.generic_action input[@value="Submit message"]')
+            expect(output_buffer).to have_tag('li.generic_action input[@value="Cancel message"]')
+            expect(output_buffer).to have_tag('li.generic_action input[@value="Reset message"]')
           end
         end
   
@@ -456,9 +456,9 @@ describe 'InputAction::Base' do
                 concat(builder.action(:reset, :as => :generic))
                 concat(builder.action(:cancel, :as => :generic))
               end)
-              output_buffer.should have_tag(%Q{li.generic_action input[@value="Custom Save Post"]})
-              output_buffer.should have_tag(%Q{li.generic_action input[@value="Custom Reset Post"]})
-              output_buffer.should have_tag(%Q{li.generic_action input[@value="Custom Cancel Post"]})
+              expect(output_buffer).to have_tag(%Q{li.generic_action input[@value="Custom Save Post"]})
+              expect(output_buffer).to have_tag(%Q{li.generic_action input[@value="Custom Reset Post"]})
+              expect(output_buffer).to have_tag(%Q{li.generic_action input[@value="Custom Cancel Post"]})
             end
           end
   
@@ -469,9 +469,9 @@ describe 'InputAction::Base' do
                 concat(builder.action(:reset, :as => :generic))
                 concat(builder.action(:cancel, :as => :generic))
               end)
-              output_buffer.should have_tag(%Q{li.generic_action input[@value="Custom Save"]})
-              output_buffer.should have_tag(%Q{li.generic_action input[@value="Custom Reset"]})
-              output_buffer.should have_tag(%Q{li.generic_action input[@value="Custom Cancel"]})
+              expect(output_buffer).to have_tag(%Q{li.generic_action input[@value="Custom Save"]})
+              expect(output_buffer).to have_tag(%Q{li.generic_action input[@value="Custom Reset"]})
+              expect(output_buffer).to have_tag(%Q{li.generic_action input[@value="Custom Cancel"]})
               ::I18n.backend.store_translations :en, :formtastic => {}
             end
           end
@@ -502,7 +502,7 @@ describe 'InputAction::Base' do
       end
       @new_user_post = ::UserPost.new
     
-      @new_user_post.stub(:new_record?).and_return(true)
+      allow(@new_user_post).to receive(:new_record?).and_return(true)
       concat(semantic_form_for(@new_user_post, :url => '') do |builder|
         concat(builder.action(:submit, :as => :generic))
         concat(builder.action(:reset, :as => :generic))
@@ -511,9 +511,9 @@ describe 'InputAction::Base' do
     end
     
     it "should render the string as the value of the button" do
-      output_buffer.should have_tag('li input[@value="Create User post"]')
-      output_buffer.should have_tag('li input[@value="Reset User post"]')
-      output_buffer.should have_tag('li input[@value="Cancel User post"]')
+      expect(output_buffer).to have_tag('li input[@value="Create User post"]')
+      expect(output_buffer).to have_tag('li input[@value="Reset User post"]')
+      expect(output_buffer).to have_tag('li input[@value="Cancel User post"]')
     end
 
   end

data/spec/actions/input_action_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe 'InputAction', 'when submitting' do
+RSpec.describe 'InputAction', 'when submitting' do
 
   include FormtasticSpecHelper
 
@@ -15,12 +15,12 @@ describe 'InputAction', 'when submitting' do
   end
   
   it 'should render a submit type of input' do
-    output_buffer.should have_tag('li.action.input_action input[@type="submit"]')
+    expect(output_buffer).to have_tag('li.action.input_action input[@type="submit"]')
   end
 
 end
 
-describe 'InputAction', 'when resetting' do
+RSpec.describe 'InputAction', 'when resetting' do
 
   include FormtasticSpecHelper
   
@@ -34,12 +34,12 @@ describe 'InputAction', 'when resetting' do
   end
   
   it 'should render a reset type of input' do
-    output_buffer.should have_tag('li.action.input_action input[@type="reset"]')
+    expect(output_buffer).to have_tag('li.action.input_action input[@type="reset"]')
   end
   
 end
 
-describe 'InputAction', 'when cancelling' do
+RSpec.describe 'InputAction', 'when cancelling' do
 
   include FormtasticSpecHelper
   
@@ -49,11 +49,11 @@ describe 'InputAction', 'when cancelling' do
   end
   
   it 'should raise an error' do
-    lambda { 
+    expect { 
       concat(semantic_form_for(@new_post) do |builder|
         concat(builder.action(:cancel, :as => :input))
       end)
-    }.should raise_error(Formtastic::UnsupportedMethodForAction)
+    }.to raise_error(Formtastic::UnsupportedMethodForAction)
   end
   
 end

data/spec/actions/link_action_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe 'LinkAction', 'when cancelling' do
+RSpec.describe 'LinkAction', 'when cancelling' do
 
   include FormtasticSpecHelper
 
@@ -18,7 +18,7 @@ describe 'LinkAction', 'when cancelling' do
     end
     
     it 'should render a submit type of input' do
-      output_buffer.should have_tag('li.action.link_action a[@href="javascript:history.back()"]')
+      expect(output_buffer).to have_tag('li.action.link_action a[@href="javascript:history.back()"]')
     end
     
   end
@@ -32,7 +32,7 @@ describe 'LinkAction', 'when cancelling' do
     end
     
     it 'should render a submit type of input' do
-      output_buffer.should have_tag('li.action.link_action a[@href="http://foo.bah/baz"]')
+      expect(output_buffer).to have_tag('li.action.link_action a[@href="http://foo.bah/baz"]')
     end
     
   end
@@ -46,14 +46,14 @@ describe 'LinkAction', 'when cancelling' do
     end
     
     it 'should render a submit type of input' do
-      output_buffer.should have_tag('li.action.link_action a[@href="/mock/path"]')
+      expect(output_buffer).to have_tag('li.action.link_action a[@href="/mock/path"]')
     end
     
   end
 
 end
 
-describe 'LinkAction', 'when submitting' do
+RSpec.describe 'LinkAction', 'when submitting' do
 
   include FormtasticSpecHelper
   
@@ -63,16 +63,16 @@ describe 'LinkAction', 'when submitting' do
   end
   
   it 'should raise an error' do
-    lambda { 
+    expect { 
       concat(semantic_form_for(@new_post) do |builder|
         concat(builder.action(:submit, :as => :link))
       end)
-    }.should raise_error(Formtastic::UnsupportedMethodForAction)
+    }.to raise_error(Formtastic::UnsupportedMethodForAction)
   end
   
 end
 
-describe 'LinkAction', 'when submitting' do
+RSpec.describe 'LinkAction', 'when submitting' do
 
   include FormtasticSpecHelper
   
@@ -82,11 +82,11 @@ describe 'LinkAction', 'when submitting' do
   end
   
   it 'should raise an error' do
-    lambda { 
+    expect { 
       concat(semantic_form_for(@new_post) do |builder|
         concat(builder.action(:reset, :as => :link))
       end)
-    }.should raise_error(Formtastic::UnsupportedMethodForAction)
+    }.to raise_error(Formtastic::UnsupportedMethodForAction)
   end
   
 end

data/spec/builder/custom_builder_spec.rb

@@ -1,13 +1,13 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe 'Formtastic::Helpers::FormHelper.builder' do
+RSpec.describe 'Formtastic::Helpers::FormHelper.builder' do
 
   include FormtasticSpecHelper
 
   class MyCustomFormBuilder < Formtastic::FormBuilder
   end
-  
+
   # TODO should be a separate spec for custom inputs
   class Formtastic::Inputs::AwesomeInput
     include Formtastic::Inputs::Base
@@ -22,32 +22,32 @@ describe 'Formtastic::Helpers::FormHelper.builder' do
   end
 
   it 'is the Formtastic::FormBuilder by default' do
-    Formtastic::Helpers::FormHelper.builder.should == Formtastic::FormBuilder
+    expect(Formtastic::Helpers::FormHelper.builder).to eq(Formtastic::FormBuilder)
   end
 
   it 'can be configured to use your own custom form builder' do
     # Set it to a custom builder class
     Formtastic::Helpers::FormHelper.builder = MyCustomFormBuilder
-    Formtastic::Helpers::FormHelper.builder.should == MyCustomFormBuilder
+    expect(Formtastic::Helpers::FormHelper.builder).to eq(MyCustomFormBuilder)
 
     # Reset it to the default
     Formtastic::Helpers::FormHelper.builder = Formtastic::FormBuilder
-    Formtastic::Helpers::FormHelper.builder.should == Formtastic::FormBuilder
+    expect(Formtastic::Helpers::FormHelper.builder).to eq(Formtastic::FormBuilder)
   end
 
   it 'should allow custom settings per form builder subclass' do
     with_config(:all_fields_required_by_default, true) do
       MyCustomFormBuilder.all_fields_required_by_default = false
 
-      MyCustomFormBuilder.all_fields_required_by_default.should be_falsey
-      Formtastic::FormBuilder.all_fields_required_by_default.should be_truthy
+      expect(MyCustomFormBuilder.all_fields_required_by_default).to be_falsey
+      expect(Formtastic::FormBuilder.all_fields_required_by_default).to be_truthy
     end
   end
 
   describe "when using a custom builder" do
 
     before do
-      @new_post.stub(:title)
+      allow(@new_post).to receive(:title)
       Formtastic::Helpers::FormHelper.builder = MyCustomFormBuilder
     end
 
@@ -59,10 +59,10 @@ describe 'Formtastic::Helpers::FormHelper.builder' do
 
       it "should yield an instance of the custom builder" do
         semantic_form_for(@new_post) do |builder|
-          builder.class.should.kind_of?(MyCustomFormBuilder)
+          expect(builder.class).to be(MyCustomFormBuilder)
         end
       end
-      
+
       # TODO should be a separate spec for custom inputs
       it "should allow me to call my custom input" do
         semantic_form_for(@new_post) do |builder|
@@ -70,31 +70,47 @@ describe 'Formtastic::Helpers::FormHelper.builder' do
         end
       end
 
-      # See: https://github.com/justinfrench/formtastic/issues/657
+      # See: https://github.com/formtastic/formtastic/issues/657
       it "should not conflict with navigasmic" do
-        self.class.any_instance.stub(:builder).and_return('navigasmic')
-        
-        lambda { semantic_form_for(@new_post) { |f| } }.should_not raise_error
+        allow_any_instance_of(self.class).to receive(:builder).and_return('navigasmic')
+
+        expect { semantic_form_for(@new_post) { |f| } }.not_to raise_error
       end
 
+      it "should use the custom builder's skipped_columns config for inputs" do
+        class AnotherCustomFormBuilder < Formtastic::FormBuilder
+          configure :skipped_columns, [:title, :created_at]
+        end
+        #AnotherCustomFormBuilder.skipped_columns = [:title, :created_at]
+
+        concat(semantic_form_for(@new_post, builder: AnotherCustomFormBuilder) do |builder|
+          concat(builder.inputs)
+        end)
+
+        expect(output_buffer).to_not have_tag('input#post_title')
+        expect(output_buffer).to_not have_tag('li#post_created_at_input')
+        expect(output_buffer).to have_tag('textarea#post_body')
+      end
     end
 
     describe "fields_for" do
 
       it "should yield an instance of the parent form builder" do
-        @new_post.stub(:comment).and_return([@fred])
-        @new_post.stub(:comment_attributes=)
+        allow(@new_post).to receive(:comment).and_return([@fred])
+        allow(@new_post).to receive(:comment_attributes=)
         semantic_form_for(@new_post, :builder => MyCustomFormBuilder) do |builder|
-          builder.class.should.kind_of?(MyCustomFormBuilder)
-          
+          expect(builder.class).to be(MyCustomFormBuilder)
+
           builder.fields_for(:comment) do |nested_builder|
-            nested_builder.class.should.kind_of?(MyCustomFormBuilder)
+            expect(nested_builder.class).to be(MyCustomFormBuilder)
           end
         end
       end
 
     end
 
+
+
   end
 
   describe "when using a builder passed to form options" do
@@ -102,10 +118,10 @@ describe 'Formtastic::Helpers::FormHelper.builder' do
     describe "fields_for" do
 
       it "should yield an instance of the parent form builder" do
-        @new_post.stub(:author_attributes=)
+        allow(@new_post).to receive(:author_attributes=)
         semantic_form_for(@new_post, :builder => MyCustomFormBuilder) do |builder|
           builder.fields_for(:author) do |nested_builder|
-            nested_builder.class.should.kind_of?(MyCustomFormBuilder)
+            expect(nested_builder.class).to be(MyCustomFormBuilder)
           end
         end
       end