formtastic 2.1.0 → 4.0.0

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,20 +1,18 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe 'hidden input' do
+RSpec.describe 'hidden input' do
 
   include FormtasticSpecHelper
 
   before do
     @output_buffer = ''
     mock_everything
-
+    
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:secret, :as => :hidden))
-      concat(builder.input(:author_id, :as => :hidden, :value => 99))
       concat(builder.input(:published, :as => :hidden, :input_html => {:value => true}))
       concat(builder.input(:reviewer, :as => :hidden, :input_html => {:class => 'new_post_reviewer', :id => 'new_post_reviewer'}))
-      concat(builder.input(:author, :as => :hidden, :value => 'direct_value', :input_html => {:value => "formtastic_value"}))
     end)
   end
 
@@ -24,43 +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 :value" do
-    output_buffer.should have_tag("form li input#post_author_id[@type=\"hidden\"][@value=\"99\"]")
-  end
-
-  # Handle Formtastic :input_html options for consistency.
   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\"]")
-  end
-
-  it "should prefer :input_html over directly supplied options" do
-    output_buffer.should have_tag("form li input#post_author_id[@type=\"hidden\"][@value=\"formtastic_value\"]")
+    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 = mock('errors')
-    @errors.stub!(:[]).with(:secret).and_return(["foo", "bah"])
-    @new_post.stub!(:errors).and_return(@errors)
+    @errors = double('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
@@ -68,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
@@ -77,17 +66,15 @@ describe 'hidden input' do
     before do
       @output_buffer = ''
       mock_everything
-
+      
       concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
         concat(builder.input(:secret, :as => :hidden))
-        concat(builder.input(:author_id, :as => :hidden, :value => 99))
         concat(builder.input(:published, :as => :hidden, :input_html => {:value => true}))
         concat(builder.input(:reviewer, :as => :hidden, :input_html => {:class => 'new_post_reviewer', :id => 'new_post_reviewer'}))
-        concat(builder.input(:author, :as => :hidden, :value => 'direct_value', :input_html => {:value => "formtastic_value"}))
       end)
     end
 
-    attributes_to_check = [:secret, :author_id, :published, :reviewer]
+    attributes_to_check = [:secret, :published, :reviewer]
     attributes_to_check.each do |a|
       it_should_have_input_wrapper_with_id("context2_post_#{a}_input")
     end
@@ -112,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
@@ -131,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
 
@@ -140,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,15 +9,15 @@ 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 = {
       :select => :author,
-      :datetime => :publish_at,
-      :date => :publish_at,
-      :time => :publish_at
+      :datetime_select => :publish_at,
+      :date_select => :publish_at,
+      :time_select => :publish_at
     }
 
   SELECT_INPUT_TYPES.each do |as, attribute|
@@ -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
 
@@ -10,18 +10,51 @@ describe 'Formtastic::FormBuilder#label' do
     mock_everything
   end
 
+  it 'should add "required string" only once with caching enabled' do
+    with_config :i18n_cache_lookups, true do
+      ::I18n.backend.store_translations :en, { :formtastic => { :labels => { :post => { :title => "I18n title" } } } }
+      required_string = "[req_string]"
+      default_required_str = Formtastic::FormBuilder.required_string
+      Formtastic::FormBuilder.required_string = required_string
+
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :required => true, :label => true)
+      end)
+      output_buffer.replace ''
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :required => true, :label => true)
+      end)
+
+      ::I18n.backend.store_translations :en, { :formtastic => { :labels => { :post => { :title => nil } } } }
+      Formtastic::FormBuilder.required_string = default_required_str
+
+      expect(output_buffer.scan(required_string).count).to eq(1)
+    end
+  end
+
   it 'should humanize the given attribute' 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
+    with_config :i18n_cache_lookups, true do
+      ::I18n.backend.store_translations :en, { :formtastic => { :labels => { :post => { :title => "I18n title" } } } }
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input("title")
+      end)
+      ::I18n.backend.store_translations :en, { :formtastic => { :labels => { :post => { :title => nil } } } }
+      expect(output_buffer).to have_tag('label', :text => /I18n title/)
+    end
   end
 
   it 'should humanize the given attribute for date fields' 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
@@ -29,25 +62,29 @@ 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
 
   describe 'when a collection is given' do
     it 'should use a supplied label_method for simple collections' do
-      concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
-        concat(builder.input(:author_id, :as => :check_boxes, :collection => [:a, :b, :c], :member_value => :to_s, :member_label => proc {|f| ('Label_%s' % [f])}))
-      end)
-      output_buffer.should have_tag('form li fieldset ol li label', /Label_[abc]/, :count => 3)
+      with_deprecation_silenced do
+        concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
+          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
+      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
-      concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
-        concat(builder.input(:author_id, :as => :check_boxes, :collection => [:a, :b, :c], :member_value => proc {|f| ('Value_%s' % [f.to_s])}))
-      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"]')
+      with_deprecation_silenced do
+        concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
+          concat(builder.input(:author_id, :as => :check_boxes, :collection => [:a, :b, :c], :member_value => proc {|f| ('Value_%s' % [f.to_s])}))
+        end)
+      end
+      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
 
@@ -56,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, :label => false)
+        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
@@ -95,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
@@ -103,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