formtastic 2.3.0.rc2 → 2.3.0.rc3

data/lib/formtastic/version.rb

@@ -1,3 +1,3 @@
 module Formtastic
-  VERSION = "2.3.0.rc2"
+  VERSION = "2.3.0.rc3"
 end

data/lib/generators/templates/_form.html.slim

@@ -4,5 +4,5 @@
     = f.input :<%= attribute.name %>
   <%- end -%>
 
-  = f.buttons do
-    = f.commit_button
+  = f.actions do
+    = f.action :submit, as: :input

data/lib/generators/templates/formtastic.rb

@@ -66,7 +66,21 @@
 # specifying that class here.  Defaults to Formtastic::FormBuilder.
 # Formtastic::Helpers::FormHelper.builder = MyCustomBuilder
 
-# You can opt-in to Formtastic's use of the HTML5 `required` attribute on `<input>`, `<select>` 
+# All formtastic forms have a class that indicates that they are just that. You
+# can change it to any class you want.
+# Formtastic::Helpers::FormHelper.default_form_class = 'formtastic'
+
+# Formtastic will infer a class name from the model, array, string ot symbol you pass to the
+# form builder. You can customize the way that class is presented by overriding
+# this proc.
+# Formtastic::Helpers::FormHelper.default_form_model_class_proc = proc { |model_class_name| model_class_name }
+
+# Allows to set a custom field_error_proc wrapper. By default this wrapper
+# is disabled since `formtastic` already adds an error class to the LI tag
+# containing the input.
+# Formtastic::Helpers::FormHelper.formtastic_field_error_proc = proc { |html_tag, instance_tag| html_tag }
+
+# You can opt-in to Formtastic's use of the HTML5 `required` attribute on `<input>`, `<select>`
 # and `<textarea>` tags by setting this to true (defaults to false).
 # Formtastic::FormBuilder.use_required_attribute = false
 

data/spec/actions/generic_action_spec.rb

@@ -244,7 +244,7 @@ describe 'InputAction::Base' do
   
     describe 'when used on a new record' do
       before do
-        @new_post.stub!(:new_record?).and_return(true)
+        @new_post.stub(:new_record?).and_return(true)
       end
   
       describe 'when explicit label is provided' do
@@ -344,7 +344,7 @@ describe 'InputAction::Base' do
   
     describe 'when used on an existing record' do
       before do
-        @new_post.stub!(:persisted?).and_return(true)
+        @new_post.stub(:persisted?).and_return(true)
       end
   
       describe 'when explicit label is provided' do
@@ -466,7 +466,7 @@ describe 'InputAction::Base' do
       end
       @new_user_post = ::UserPost.new
     
-      @new_user_post.stub!(:new_record?).and_return(true)
+      @new_user_post.stub(: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))

data/spec/builder/custom_builder_spec.rb

@@ -47,7 +47,7 @@ describe 'Formtastic::Helpers::FormHelper.builder' do
   describe "when using a custom builder" do
 
     before do
-      @new_post.stub!(:title)
+      @new_post.stub(:title)
       Formtastic::Helpers::FormHelper.builder = MyCustomFormBuilder
     end
 
@@ -72,9 +72,9 @@ describe 'Formtastic::Helpers::FormHelper.builder' do
 
       # See: https://github.com/justinfrench/formtastic/issues/657
       it "should not conflict with navigasmic" do
-        stub!(:builder).and_return('navigasmic')
-
-        lambda { semantic_form_for(@new_post) }.should_not raise_error(NoMethodError)
+        self.class.any_instance.stub(:builder).and_return('navigasmic')
+        
+        lambda { semantic_form_for(@new_post) { |f| } }.should_not raise_error
       end
 
     end
@@ -82,8 +82,8 @@ describe 'Formtastic::Helpers::FormHelper.builder' do
     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=)
+        @new_post.stub(:comment).and_return([@fred])
+        @new_post.stub(:comment_attributes=)
         semantic_form_for(@new_post, :builder => MyCustomFormBuilder) do |builder|
           builder.class.should.kind_of?(MyCustomFormBuilder)
           
@@ -102,7 +102,7 @@ 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=)
+        @new_post.stub(: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)

data/spec/builder/semantic_fields_for_spec.rb

@@ -8,7 +8,7 @@ describe 'Formtastic::FormBuilder#fields_for' do
   before do
     @output_buffer = ''
     mock_everything
-    @new_post.stub!(:author).and_return(::Author.new)
+    @new_post.stub(:author).and_return(::Author.new)
   end
 
   context 'outside a form_for block' do
@@ -77,7 +77,7 @@ describe 'Formtastic::FormBuilder#fields_for' do
     end
     
     it 'should sanitize html id for li tag' do
-      @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
+      @bob.stub(:column_for_attribute).and_return(double('column', :type => :string, :limit => 255))
       concat(semantic_form_for(@new_post) do |builder|
         concat(builder.semantic_fields_for(@bob, :index => 1) do |nested_builder|
           concat(nested_builder.inputs(:login))
@@ -90,7 +90,7 @@ describe 'Formtastic::FormBuilder#fields_for' do
     end
     
     it 'should use namespace provided in nested fields' do
-      @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
+      @bob.stub(:column_for_attribute).and_return(double('column', :type => :string, :limit => 255))
       concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
         concat(builder.semantic_fields_for(@bob, :index => 1) do |nested_builder|
           concat(nested_builder.inputs(:login))
@@ -100,9 +100,9 @@ describe 'Formtastic::FormBuilder#fields_for' do
     end
     
     it 'should render errors on the nested inputs' do
-      @errors = mock('errors')
-      @errors.stub!(:[]).with(errors_matcher(:login)).and_return(['oh noes'])      
-      @bob.stub!(:errors).and_return(@errors)
+      @errors = double('errors')
+      @errors.stub(:[]).with(errors_matcher(:login)).and_return(['oh noes'])      
+      @bob.stub(:errors).and_return(@errors)
       
       concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
         concat(builder.semantic_fields_for(@bob) do |nested_builder|
@@ -120,8 +120,8 @@ describe 'Formtastic::FormBuilder#fields_for' do
       output_buffer.replace ''
       
       @fred.posts.size.should == 1
-      @fred.posts.first.stub!(:persisted?).and_return(true)
-      @fred.stub!(:posts_attributes=)
+      @fred.posts.first.stub(:persisted?).and_return(true)
+      @fred.stub(:posts_attributes=)
       concat(semantic_form_for(@fred) do |builder|
         concat(builder.semantic_fields_for(:posts) do |nested_builder|
           concat(nested_builder.input(:id, :as => :hidden))

data/spec/generators/formtastic/form/form_generator_spec.rb

@@ -14,11 +14,11 @@ describe Formtastic::FormGenerator do
     @output_buffer = ''
     prepare_destination
     mock_everything
-    ::Post.stub!(:reflect_on_all_associations).with(:belongs_to).and_return([
-      mock('reflection', :name => :author, :options => {}, :klass => ::Author, :macro => :belongs_to),
-      mock('reflection', :name => :reviewer, :options => {:class_name => 'Author'}, :klass => ::Author, :macro => :belongs_to),
-      mock('reflection', :name => :main_post, :options => {}, :klass => ::Post, :macro => :belongs_to),
-      mock('reflection', :name => :attachment, :options => {:polymorphic => true}, :macro => :belongs_to),
+    ::Post.stub(:reflect_on_all_associations).with(:belongs_to).and_return([
+      double('reflection', :name => :author, :options => {}, :klass => ::Author, :macro => :belongs_to),
+      double('reflection', :name => :reviewer, :options => {:class_name => 'Author'}, :klass => ::Author, :macro => :belongs_to),
+      double('reflection', :name => :main_post, :options => {}, :klass => ::Post, :macro => :belongs_to),
+      double('reflection', :name => :attachment, :options => {:polymorphic => true}, :macro => :belongs_to),
     ])
   end
   
@@ -34,7 +34,7 @@ describe Formtastic::FormGenerator do
 
   describe 'with existing model' do
     it 'should not raise an exception' do
-      lambda { run_generator %w(Post) }.should_not raise_error(Thor::RequiredArgumentMissingError)
+      lambda { run_generator %w(Post) }.should_not raise_error
     end
   end
 

data/spec/helpers/action_helper_spec.rb

@@ -53,7 +53,7 @@ describe 'Formtastic::FormBuilder#action' do
       it 'should call the corresponding action class with .to_html' do
         [:input, :button, :link].each do |action_style|
           semantic_form_for(:project, :url => "http://test.host") do |builder|
-            action_instance = mock('Action instance')
+            action_instance = double('Action instance')
             action_class = "#{action_style.to_s}_action".classify
             action_constant = "Formtastic::Actions::#{action_class}".constantize
     
@@ -99,7 +99,7 @@ describe 'Formtastic::FormBuilder#action' do
     #          it 'should render a label with localized text and not apply the label_str_method' do
     #            with_config :label_str_method, :reverse do
     #              @localized_label_text = 'Localized title'
-    #              @new_post.stub!(:meta_description)
+    #              @new_post.stub(:meta_description)
     #              ::I18n.backend.store_translations :en,
     #                :formtastic => {
     #                  :labels => {
@@ -132,7 +132,7 @@ describe 'Formtastic::FormBuilder#action' do
     #
     #      describe 'and object is given' do
     #        it 'should delegate the label logic to class human attribute name and pass it down to the label tag' do
-    #          @new_post.stub!(:meta_description) # a two word method name
+    #          @new_post.stub(:meta_description) # a two word method name
     #          @new_post.class.should_receive(:human_attribute_name).with('meta_description').and_return('meta_description'.humanize)
     #
     #          concat(semantic_form_for(@new_post) do |builder|
@@ -145,7 +145,7 @@ describe 'Formtastic::FormBuilder#action' do
     #      describe 'and object is given with label_str_method set to :capitalize' do
     #        it 'should capitalize method name, passing it down to the label tag' do
     #          with_config :label_str_method, :capitalize do
-    #            @new_post.stub!(:meta_description)
+    #            @new_post.stub(:meta_description)
     #
     #            concat(semantic_form_for(@new_post) do |builder|
     #              concat(builder.input(:meta_description))
@@ -266,7 +266,7 @@ describe 'Formtastic::FormBuilder#action' do
     context 'when a customized top-level class does not exist' do
   
       it 'should instantiate the Formtastic action' do
-        action = mock('action', :to_html => 'some HTML')
+        action = double('action', :to_html => 'some HTML')
         Formtastic::Actions::ButtonAction.should_receive(:new).and_return(action)
         concat(semantic_form_for(@new_post) do |builder|
           builder.action(:commit, :as => :button)
@@ -280,7 +280,7 @@ describe 'Formtastic::FormBuilder#action' do
         class ::ButtonAction < Formtastic::Actions::ButtonAction
         end
   
-        action = mock('action', :to_html => 'some HTML')
+        action = double('action', :to_html => 'some HTML')
         Formtastic::Actions::ButtonAction.should_not_receive(:new)
         ::ButtonAction.should_receive(:new).and_return(action)
   
@@ -330,31 +330,31 @@ describe 'Formtastic::FormBuilder#action' do
           concat(semantic_form_for(@new_post) do |builder|
             concat(builder.action(:cancel, :as => :link))
           end)
-        }.should_not raise_error(Formtastic::UnsupportedMethodForAction)
+        }.should_not raise_error
         
         lambda {
           concat(semantic_form_for(@new_post) do |builder|
             concat(builder.action(:submit, :as => :input))
           end)
-        }.should_not raise_error(Formtastic::UnsupportedMethodForAction)
+        }.should_not raise_error
 
         lambda {
           concat(semantic_form_for(@new_post) do |builder|
             concat(builder.action(:submit, :as => :button))
           end)
-        }.should_not raise_error(Formtastic::UnsupportedMethodForAction)
+        }.should_not raise_error
         
         lambda {
           concat(semantic_form_for(@new_post) do |builder|
             concat(builder.action(:reset, :as => :input))
           end)
-        }.should_not raise_error(Formtastic::UnsupportedMethodForAction)
+        }.should_not raise_error
         
         lambda {
           concat(semantic_form_for(@new_post) do |builder|
             concat(builder.action(:reset, :as => :button))
           end)
-        }.should_not raise_error(Formtastic::UnsupportedMethodForAction)
+        }.should_not raise_error
       end
       
     end

data/spec/helpers/form_helper_spec.rb

@@ -23,7 +23,7 @@ describe 'FormHelper' do
       end)
       output_buffer.should have_tag("form.formtastic")
     end
-    
+
     it 'adds a "novalidate" attribute to the generated form when configured to do so' do
       with_config :perform_browser_validations, true do
         concat(semantic_form_for(@new_post, :url => '/hello') do |builder|
@@ -31,7 +31,7 @@ describe 'FormHelper' do
         output_buffer.should_not have_tag("form[@novalidate]")
       end
     end
-    
+
     it 'omits a "novalidate" attribute to the generated form when configured to do so' do
       with_config :perform_browser_validations, false do
         concat(semantic_form_for(@new_post, :url => '/hello') do |builder|
@@ -62,7 +62,7 @@ describe 'FormHelper' do
       end)
       output_buffer.should have_tag("form.xyz")
     end
-    
+
     it 'omits the leading spaces from the classes in the generated form when the default class is nil' do
       Formtastic::Helpers::FormHelper.default_form_class = nil
       concat(semantic_form_for(::Post.new, :as => :post, :url => '/hello') do |builder|
@@ -102,6 +102,17 @@ describe 'FormHelper' do
       output_buffer.should have_tag("form.namespaced_post")
     end
 
+    it 'adds a customized class to the generated form' do
+      Formtastic::Helpers::FormHelper.default_form_model_class_proc = lambda { |model_class_name| "#{model_class_name}_form" }
+      concat(semantic_form_for(@new_post, :url => '/hello') do |builder|
+      end)
+      output_buffer.should have_tag("form.post_form")
+
+      concat(semantic_form_for(:project, :url => '/hello') do |builder|
+      end)
+      output_buffer.should have_tag("form.project_form")
+    end
+
     describe 'allows :html options' do
       before(:each) do
         concat(semantic_form_for(@new_post, :url => '/hello', :html => { :id => "something-special", :class => "something-extra", :multipart => true }) do |builder|
@@ -142,7 +153,7 @@ describe 'FormHelper' do
       end
     end
 
-    describe ActionView::Base.field_error_proc do
+    describe 'ActionView::Base.field_error_proc' do
       it 'is set to no-op wrapper by default' do
         semantic_form_for(@new_post, :url => '/hello') do |builder|
           ::ActionView::Base.field_error_proc.call("html", nil).should == "html"
@@ -150,21 +161,21 @@ describe 'FormHelper' do
       end
 
       it 'is set to the configured custom field_error_proc' do
-        field_error_proc = mock()
-        Formtastic::Helpers::FormHelper.field_error_proc = field_error_proc
+        field_error_proc = double()
+        Formtastic::Helpers::FormHelper.formtastic_field_error_proc = field_error_proc
         semantic_form_for(@new_post, :url => '/hello') do |builder|
           ::ActionView::Base.field_error_proc.should == field_error_proc
         end
       end
-      
+
       it 'is restored to its original value after the form is rendered' do
-        lambda do 
-          Formtastic::Helpers::FormHelper.field_error_proc = proc {""}
+        lambda do
+          Formtastic::Helpers::FormHelper.formtastic_field_error_proc = proc {""}
           semantic_form_for(@new_post, :url => '/hello') { |builder| }
         end.should_not change(::ActionView::Base, :field_error_proc)
       end
-    end 
-    
+    end
+
     describe "with :builder option" do
       it "yields an instance of the given builder" do
         class MyAwesomeCustomBuilder < Formtastic::FormBuilder

data/spec/helpers/input_helper_spec.rb

@@ -9,9 +9,9 @@ describe 'Formtastic::FormBuilder#input' do
     @output_buffer = ''
     mock_everything
 
-    @errors = mock('errors')
-    @errors.stub!(:[]).and_return([])
-    @new_post.stub!(:errors).and_return(@errors)
+    @errors = double('errors')
+    @errors.stub(:[]).and_return([])
+    @new_post.stub(:errors).and_return(@errors)
   end
 
   after do
@@ -72,7 +72,7 @@ describe 'Formtastic::FormBuilder#input' do
         end
 
         it 'should set and "optional" class also when there is presence validator' do
-          @new_post.class.should_receive(:validators_on).with(:title).any_number_of_times.and_return([
+          @new_post.class.should_receive(:validators_on).with(:title).at_least(:once).and_return([
             active_model_presence_validator([:title])
           ])
           concat(semantic_form_for(@new_post) do |builder|
@@ -112,20 +112,20 @@ describe 'Formtastic::FormBuilder#input' do
 
         describe 'and an object with :validators_on was given (ActiveModel, Active Resource)' do
           before do
-            @new_post.stub!(:class).and_return(::PostModel)
+            @new_post.stub(:class).and_return(::PostModel)
           end
 
           after do
-            @new_post.stub!(:class).and_return(::Post)
+            @new_post.stub(:class).and_return(::Post)
           end
           describe 'and validates_presence_of was called for the method' do
             it 'should be required' do
 
-              @new_post.class.should_receive(:validators_on).with(:title).any_number_of_times.and_return([
+              @new_post.class.should_receive(:validators_on).with(:title).at_least(:once).and_return([
                 active_model_presence_validator([:title])
               ])
 
-              @new_post.class.should_receive(:validators_on).with(:body).any_number_of_times.and_return([
+              @new_post.class.should_receive(:validators_on).with(:body).at_least(:once).and_return([
                 active_model_presence_validator([:body], {:if => true})
               ])
 
@@ -139,7 +139,7 @@ describe 'Formtastic::FormBuilder#input' do
 
             it 'should be required when there is :on => :create option on create' do
               with_config :required_string, " required yo!" do
-                @new_post.class.should_receive(:validators_on).with(:title).any_number_of_times.and_return([
+                @new_post.class.should_receive(:validators_on).with(:title).at_least(:once).and_return([
                   active_model_presence_validator([:title], {:on => :create})
                 ])
                 concat(semantic_form_for(@new_post) do |builder|
@@ -152,7 +152,7 @@ describe 'Formtastic::FormBuilder#input' do
 
             it 'should be required when there is :on => :save option on create' do
               with_config :required_string, " required yo!" do
-                @new_post.class.should_receive(:validators_on).with(:title).any_number_of_times.and_return([
+                @new_post.class.should_receive(:validators_on).with(:title).at_least(:once).and_return([
                   active_model_presence_validator([:title], {:on => :save})
                 ])
                 concat(semantic_form_for(@new_post) do |builder|
@@ -165,7 +165,7 @@ describe 'Formtastic::FormBuilder#input' do
 
             it 'should be required when there is :on => :save option on update' do
               with_config :required_string, " required yo!" do
-                @fred.class.should_receive(:validators_on).with(:login).any_number_of_times.and_return([
+                @fred.class.should_receive(:validators_on).with(:login).at_least(:once).and_return([
                   active_model_presence_validator([:login], {:on => :save})
                 ])
                 concat(semantic_form_for(@fred) do |builder|
@@ -177,7 +177,7 @@ describe 'Formtastic::FormBuilder#input' do
             end
 
             it 'should not be required when there is :on => :create option on update' do
-              @fred.class.should_receive(:validators_on).with(:login).any_number_of_times.and_return([
+              @fred.class.should_receive(:validators_on).with(:login).at_least(:once).and_return([
                 active_model_presence_validator([:login], {:on => :create})
               ])
               concat(semantic_form_for(@fred) do |builder|
@@ -188,7 +188,7 @@ describe 'Formtastic::FormBuilder#input' do
             end
 
             it 'should not be required when there is :on => :update option on create' do
-              @new_post.class.should_receive(:validators_on).with(:title).any_number_of_times.and_return([
+              @new_post.class.should_receive(:validators_on).with(:title).at_least(:once).and_return([
                 active_model_presence_validator([:title], {:on => :update})
               ])
               concat(semantic_form_for(@new_post) do |builder|
@@ -241,14 +241,14 @@ describe 'Formtastic::FormBuilder#input' do
 
           describe 'and validates_inclusion_of was called for the method' do
             it 'should be required' do
-              @new_post.class.should_receive(:validators_on).with(:published).any_number_of_times.and_return([
+              @new_post.class.should_receive(:validators_on).with(:published).at_least(:once).and_return([
                 active_model_inclusion_validator([:published], {:in => [false, true]})
               ])
               should_be_required(:tag => :published, :required => true)
             end
 
             it 'should not be required if allow_blank is true' do
-              @new_post.class.should_receive(:validators_on).with(:published).any_number_of_times.and_return([
+              @new_post.class.should_receive(:validators_on).with(:published).at_least(:once).and_return([
                 active_model_inclusion_validator([:published], {:in => [false, true], :allow_blank => true})
               ])
               should_be_required(:tag => :published, :required => false)
@@ -282,13 +282,13 @@ describe 'Formtastic::FormBuilder#input' do
           end
 
           def add_presence_validator(options)
-            @new_post.class.stub!(:validators_on).with(options[:tag]).and_return([
+            @new_post.class.stub(:validators_on).with(options[:tag]).and_return([
               active_model_presence_validator([options[:tag]], options[:options])
             ])
           end
 
           def add_length_validator(options)
-            @new_post.class.should_receive(:validators_on).with(options[:tag]).any_number_of_times {[
+            @new_post.class.should_receive(:validators_on).with(options[:tag]).at_least(:once) {[
               active_model_length_validator([options[:tag]], options[:options])
             ]}
           end
@@ -377,32 +377,32 @@ describe 'Formtastic::FormBuilder#input' do
         end
 
         it 'should default to a string for methods on objects that don\'t respond to "column_for_attribute"' do
-          @new_post.stub!(:method_without_a_database_column)
-          @new_post.stub!(:column_for_attribute).and_return(nil)
+          @new_post.stub(:method_without_a_database_column)
+          @new_post.stub(:column_for_attribute).and_return(nil)
           default_input_type(nil, :method_without_a_database_column).should == :string
         end
 
         it 'should default to :password for methods that don\'t have a column in the database but "password" is in the method name' do
-          @new_post.stub!(:password_method_without_a_database_column)
-          @new_post.stub!(:column_for_attribute).and_return(nil)
+          @new_post.stub(:password_method_without_a_database_column)
+          @new_post.stub(:column_for_attribute).and_return(nil)
           default_input_type(nil, :password_method_without_a_database_column).should == :password
         end
 
         it 'should default to :password for methods on objects that don\'t respond to "column_for_attribute" but "password" is in the method name' do
-          @new_post.stub!(:password_method_without_a_database_column)
-          @new_post.stub!(:column_for_attribute).and_return(nil)
+          @new_post.stub(:password_method_without_a_database_column)
+          @new_post.stub(:column_for_attribute).and_return(nil)
           default_input_type(nil, :password_method_without_a_database_column).should == :password
         end
 
         it 'should default to :number for "integer" column with name ending in "_id"' do
-          @new_post.stub!(:aws_instance_id)
-          @new_post.stub!(:column_for_attribute).with(:aws_instance_id).and_return(mock('column', :type => :integer))
+          @new_post.stub(:aws_instance_id)
+          @new_post.stub(:column_for_attribute).with(:aws_instance_id).and_return(double('column', :type => :integer))
           default_input_type(:integer, :aws_instance_id).should == :number
         end
 
         it 'should default to :select for associations' do
-          @new_post.class.stub!(:reflect_on_association).with(:user_id).and_return(mock('ActiveRecord::Reflection::AssociationReflection'))
-          @new_post.class.stub!(:reflect_on_association).with(:section_id).and_return(mock('ActiveRecord::Reflection::AssociationReflection'))
+          @new_post.class.stub(:reflect_on_association).with(:user_id).and_return(double('ActiveRecord::Reflection::AssociationReflection'))
+          @new_post.class.stub(:reflect_on_association).with(:section_id).and_return(double('ActiveRecord::Reflection::AssociationReflection'))
           default_input_type(:integer, :user_id).should == :select
           default_input_type(:integer, :section_id).should == :select
         end
@@ -473,11 +473,11 @@ describe 'Formtastic::FormBuilder#input' do
         describe 'defaulting to file column' do
           Formtastic::FormBuilder.file_methods.each do |method|
             it "should default to :file for attributes that respond to ##{method}" do
-              column = mock('column')
+              column = double('column')
 
               Formtastic::FormBuilder.file_methods.each do |test|
                 ### TODO: Check if this is ok
-                column.stub!(method).with(test).and_return(method == test)
+                column.stub(method).with(test).and_return(method == test)
               end
 
               @new_post.should_receive(method).and_return(column)
@@ -493,10 +493,10 @@ describe 'Formtastic::FormBuilder#input' do
 
       it 'should call the corresponding input class with .to_html' do
         [:select, :time_zone, :radio, :date_select, :datetime_select, :time_select, :boolean, :check_boxes, :hidden, :string, :password, :number, :text, :file].each do |input_style|
-          @new_post.stub!(:generic_column_name)
-          @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
+          @new_post.stub(:generic_column_name)
+          @new_post.stub(:column_for_attribute).and_return(double('column', :type => :string, :limit => 255))
           semantic_form_for(@new_post) do |builder|
-            input_instance = mock('Input instance')
+            input_instance = double('Input instance')
             input_class = "#{input_style.to_s}_input".classify
             input_constant = "Formtastic::Inputs::#{input_class}".constantize
 
@@ -542,7 +542,7 @@ describe 'Formtastic::FormBuilder#input' do
               it 'should render a label with localized text and not apply the label_str_method' do
                 with_config :label_str_method, :reverse do
                   @localized_label_text = 'Localized title'
-                  @new_post.stub!(:meta_description)
+                  @new_post.stub(:meta_description)
                   ::I18n.backend.store_translations :en,
                     :formtastic => {
                       :labels => {
@@ -575,7 +575,7 @@ describe 'Formtastic::FormBuilder#input' do
 
           describe 'and object is given' do
             it 'should delegate the label logic to class human attribute name and pass it down to the label tag' do
-              @new_post.stub!(:meta_description) # a two word method name
+              @new_post.stub(:meta_description) # a two word method name
               @new_post.class.should_receive(:human_attribute_name).with('meta_description').and_return('meta_description'.humanize)
 
               concat(semantic_form_for(@new_post) do |builder|
@@ -588,7 +588,7 @@ describe 'Formtastic::FormBuilder#input' do
           describe 'and object is given with label_str_method set to :capitalize' do
             it 'should capitalize method name, passing it down to the label tag' do
               with_config :label_str_method, :capitalize do
-                @new_post.stub!(:meta_description)
+                @new_post.stub(:meta_description)
 
                 concat(semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:meta_description))
@@ -838,15 +838,15 @@ describe 'Formtastic::FormBuilder#input' do
     describe ':collection option' do
 
       it "should be required on polymorphic associations" do
-        @new_post.stub!(:commentable)
-        @new_post.class.stub!(:reflections).and_return({
-          :commentable => mock('macro_reflection', :options => { :polymorphic => true }, :macro => :belongs_to)
+        @new_post.stub(:commentable)
+        @new_post.class.stub(:reflections).and_return({
+          :commentable => double('macro_reflection', :options => { :polymorphic => true }, :macro => :belongs_to)
         })
-        @new_post.stub!(:column_for_attribute).with(:commentable).and_return(
-          mock('column', :type => :integer)
+        @new_post.stub(:column_for_attribute).with(:commentable).and_return(
+          double('column', :type => :integer)
         )
-        @new_post.class.stub!(:reflect_on_association).with(:commentable).and_return(
-          mock('reflection', :macro => :belongs_to, :options => { :polymorphic => true })
+        @new_post.class.stub(:reflect_on_association).with(:commentable).and_return(
+          double('reflection', :macro => :belongs_to, :options => { :polymorphic => true })
         )
         expect {
           concat(semantic_form_for(@new_post) do |builder|
@@ -892,7 +892,7 @@ describe 'Formtastic::FormBuilder#input' do
     context 'when a customized top-level class does not exist' do
 
       it 'should instantiate the Formtastic input' do
-        input = mock('input', :to_html => 'some HTML')
+        input = double('input', :to_html => 'some HTML')
         Formtastic::Inputs::StringInput.should_receive(:new).and_return(input)
         concat(semantic_form_for(@new_post) do |builder|
           builder.input(:title, :as => :string)
@@ -906,7 +906,7 @@ describe 'Formtastic::FormBuilder#input' do
         class ::StringInput < Formtastic::Inputs::StringInput
         end
 
-        input = mock('input', :to_html => 'some HTML')
+        input = double('input', :to_html => 'some HTML')
         Formtastic::Inputs::StringInput.should_not_receive(:new)
         ::StringInput.should_receive(:new).and_return(input)