formtastic 3.1.1 → 4.0.0.rc1

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|
@@ -72,29 +72,45 @@ describe 'Formtastic::Helpers::FormHelper.builder' do
 
       # See: https://github.com/justinfrench/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

data/spec/builder/error_proc_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe 'Rails field_error_proc' do
+RSpec.describe 'Rails field_error_proc' do
 
   include FormtasticSpecHelper
 
@@ -14,13 +14,13 @@ describe 'Rails field_error_proc' do
     current_field_error_proc = ::ActionView::Base.field_error_proc
 
     semantic_form_for(@new_post) do |builder|
-      ::ActionView::Base.field_error_proc.should_not == current_field_error_proc
+      expect(::ActionView::Base.field_error_proc).not_to eq(current_field_error_proc)
     end
 
-    ::ActionView::Base.field_error_proc.should == current_field_error_proc
+    expect(::ActionView::Base.field_error_proc).to eq(current_field_error_proc)
 
     form_for(@new_post) do |builder|
-      ::ActionView::Base.field_error_proc.should == current_field_error_proc
+      expect(::ActionView::Base.field_error_proc).to eq(current_field_error_proc)
     end
   end
 

data/spec/builder/semantic_fields_for_spec.rb

@@ -1,44 +1,44 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe 'Formtastic::FormBuilder#fields_for' do
+RSpec.describe 'Formtastic::FormBuilder#fields_for' do
 
   include FormtasticSpecHelper
 
   before do
     @output_buffer = ''
     mock_everything
-    @new_post.stub(:author).and_return(::Author.new)
+    allow(@new_post).to receive(:author).and_return(::Author.new)
   end
 
   context 'outside a form_for block' do
     it 'yields an instance of FormHelper.builder' do
       semantic_fields_for(@new_post) do |nested_builder|
-        nested_builder.class.should == Formtastic::Helpers::FormHelper.builder
+        expect(nested_builder.class).to eq(Formtastic::Helpers::FormHelper.builder)
       end
       semantic_fields_for(@new_post.author) do |nested_builder|
-        nested_builder.class.should == Formtastic::Helpers::FormHelper.builder
+        expect(nested_builder.class).to eq(Formtastic::Helpers::FormHelper.builder)
       end
       semantic_fields_for(:author, @new_post.author) do |nested_builder|
-        nested_builder.class.should == Formtastic::Helpers::FormHelper.builder
+        expect(nested_builder.class).to eq(Formtastic::Helpers::FormHelper.builder)
       end
       semantic_fields_for(:author, @hash_backed_author) do |nested_builder|
-        nested_builder.class.should == Formtastic::Helpers::FormHelper.builder
+        expect(nested_builder.class).to eq(Formtastic::Helpers::FormHelper.builder)
       end
     end
     
     it 'should respond to input' do
       semantic_fields_for(@new_post) do |nested_builder|
-        nested_builder.respond_to?(:input).should be_truthy
+        expect(nested_builder.respond_to?(:input)).to be_truthy
       end
       semantic_fields_for(@new_post.author) do |nested_builder|
-        nested_builder.respond_to?(:input).should be_truthy
+        expect(nested_builder.respond_to?(:input)).to be_truthy
       end
       semantic_fields_for(:author, @new_post.author) do |nested_builder|
-        nested_builder.respond_to?(:input).should be_truthy
+        expect(nested_builder.respond_to?(:input)).to be_truthy
       end
       semantic_fields_for(:author, @hash_backed_author) do |nested_builder|
-        nested_builder.respond_to?(:input).should be_truthy
+        expect(nested_builder.respond_to?(:input)).to be_truthy
       end
     end
   end
@@ -47,7 +47,7 @@ describe 'Formtastic::FormBuilder#fields_for' do
     it 'yields an instance of FormHelper.builder' do
       semantic_form_for(@new_post) do |builder|
         builder.semantic_fields_for(:author) do |nested_builder|
-          nested_builder.class.should == Formtastic::Helpers::FormHelper.builder
+          expect(nested_builder.class).to eq(Formtastic::Helpers::FormHelper.builder)
         end
       end
     end
@@ -55,7 +55,7 @@ describe 'Formtastic::FormBuilder#fields_for' do
     it 'yields an instance of FormHelper.builder with hash-like model' do
       semantic_form_for(:user) do |builder|
         builder.semantic_fields_for(:author, @hash_backed_author) do |nested_builder|
-          nested_builder.class.should == Formtastic::Helpers::FormHelper.builder
+          expect(nested_builder.class).to eq(Formtastic::Helpers::FormHelper.builder)
         end
       end
     end
@@ -63,7 +63,7 @@ describe 'Formtastic::FormBuilder#fields_for' do
     it 'nests the object name' do
       semantic_form_for(@new_post) do |builder|
         builder.semantic_fields_for(@bob) do |nested_builder|
-          nested_builder.object_name.should == 'post[author]'
+          expect(nested_builder.object_name).to eq('post[author]')
         end
       end
     end
@@ -71,45 +71,45 @@ describe 'Formtastic::FormBuilder#fields_for' do
     it 'supports passing collection as second parameter' do
       semantic_form_for(@new_post) do |builder|
         builder.semantic_fields_for(:author, [@fred,@bob]) do |nested_builder|
-          nested_builder.object_name.should =~ /post\[author_attributes\]\[\d+\]/
+          expect(nested_builder.object_name).to match(/post\[author_attributes\]\[\d+\]/)
         end
       end
     end
     
     it 'should sanitize html id for li tag' do
-      @bob.stub(:column_for_attribute).and_return(double('column', :type => :string, :limit => 255))
+      allow(@bob).to receive(: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))
         end)
       end)
-      output_buffer.should have_tag('form fieldset.inputs #post_author_1_login_input')
+      expect(output_buffer).to have_tag('form fieldset.inputs #post_author_1_login_input')
       # Not valid selector, so using good ol' regex
-      output_buffer.should_not =~ /id="post\[author\]_1_login_input"/
+      expect(output_buffer).not_to match(/id="post\[author\]_1_login_input"/)
       # <=> output_buffer.should_not have_tag('form fieldset.inputs #post[author]_1_login_input')
     end
     
     it 'should use namespace provided in nested fields' do
-      @bob.stub(:column_for_attribute).and_return(double('column', :type => :string, :limit => 255))
+      allow(@bob).to receive(: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))
         end)
       end)
-      output_buffer.should have_tag('form fieldset.inputs #context2_post_author_1_login_input')
+      expect(output_buffer).to have_tag('form fieldset.inputs #context2_post_author_1_login_input')
     end
     
     it 'should render errors on the nested inputs' do
       @errors = double('errors')
-      @errors.stub(:[]).with(errors_matcher(:login)).and_return(['oh noes'])      
-      @bob.stub(:errors).and_return(@errors)
+      allow(@errors).to receive(:[]).with(errors_matcher(:login)).and_return(['oh noes'])      
+      allow(@bob).to receive(:errors).and_return(@errors)
       
       concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
         concat(builder.semantic_fields_for(@bob) do |nested_builder|
           concat(nested_builder.inputs(:login))
         end)
       end)
-      output_buffer.should =~ /oh noes/
+      expect(output_buffer).to match(/oh noes/)
     end
     
   end
@@ -119,9 +119,9 @@ describe 'Formtastic::FormBuilder#fields_for' do
     before do
       output_buffer.replace ''
       
-      @fred.posts.size.should == 1
-      @fred.posts.first.stub(:persisted?).and_return(true)
-      @fred.stub(:posts_attributes=)
+      expect(@fred.posts.size).to eq(1)
+      allow(@fred.posts.first).to receive(:persisted?).and_return(true)
+      allow(@fred).to receive(: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))
@@ -131,11 +131,11 @@ describe 'Formtastic::FormBuilder#fields_for' do
     end
   
     it "should only render one hidden input (my one)" do
-      output_buffer.should have_tag 'input#author_posts_attributes_0_id', :count => 1
+      expect(output_buffer).to have_tag 'input#author_posts_attributes_0_id', :count => 1
     end
     
     it "should render the hidden input inside an li.hidden" do
-      output_buffer.should have_tag 'li.hidden input#author_posts_attributes_0_id'
+      expect(output_buffer).to have_tag 'li.hidden input#author_posts_attributes_0_id'
     end
   end
 

data/spec/fast_spec_helper.rb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+$LOAD_PATH << 'lib/formtastic'
+require 'active_support/all'
+require 'localized_string'
+require 'inputs'
+require 'helpers'
+
+class MyInput
+  include Formtastic::Inputs::Base
+end
+
+I18n.enforce_available_locales = false if I18n.respond_to?(:enforce_available_locales)