formtastic 3.1.3 → 5.0.0

data/spec/helpers/actions_helper_spec.rb

@@ -1,12 +1,13 @@
 # encoding: utf-8
+# frozen_string_literal: true
 require 'spec_helper'
 
-describe 'Formtastic::FormBuilder#actions' do
+RSpec.describe 'Formtastic::FormBuilder#actions' do
 
   include FormtasticSpecHelper
 
   before do
-    @output_buffer = ''
+    @output_buffer = ActionView::OutputBuffer.new ''
     mock_everything
   end
 
@@ -21,123 +22,123 @@ describe 'Formtastic::FormBuilder#actions' do
       end
 
       it 'should render a fieldset inside the form, with a class of "actions"' do
-        output_buffer.should have_tag("form fieldset.actions")
+        expect(output_buffer.to_str).to have_tag("form fieldset.actions")
       end
 
       it 'should render an ol inside the fieldset' do
-        output_buffer.should have_tag("form fieldset.actions ol")
+        expect(output_buffer.to_str).to have_tag("form fieldset.actions ol")
       end
 
       it 'should render the contents of the block inside the ol' do
-        output_buffer.should have_tag("form fieldset.actions ol", /hello/)
+        expect(output_buffer.to_str).to have_tag("form fieldset.actions ol", :text => /hello/)
       end
 
       it 'should not render a legend inside the fieldset' do
-        output_buffer.should_not have_tag("form fieldset.actions legend")
+        expect(output_buffer.to_str).not_to have_tag("form fieldset.actions legend")
       end
     end
 
     describe 'when a :name option is provided' do
       before do
         @legend_text = "Advanced options"
-    
+
         concat(semantic_form_for(@new_post) do |builder|
           builder.actions :name => @legend_text do
           end
         end)
       end
       it 'should render a fieldset inside the form' do
-        output_buffer.should have_tag("form fieldset.actions legend", /#{@legend_text}/)
+        expect(output_buffer.to_str).to have_tag("form fieldset.actions legend", :text => /#{@legend_text}/)
       end
     end
-    
+
     describe 'when other options are provided' do
       before do
         @id_option = 'advanced'
         @class_option = 'wide'
-    
+
         concat(semantic_form_for(@new_post) do |builder|
           builder.actions :id => @id_option, :class => @class_option do
           end
         end)
       end
       it 'should pass the options into the fieldset tag as attributes' do
-        output_buffer.should have_tag("form fieldset##{@id_option}")
-        output_buffer.should have_tag("form fieldset.#{@class_option}")
+        expect(output_buffer.to_str).to have_tag("form fieldset##{@id_option}")
+        expect(output_buffer.to_str).to have_tag("form fieldset.#{@class_option}")
       end
     end
-    
+
   end
 
   describe 'without a block' do
-  
+
     describe 'with no args (default buttons)' do
-  
+
       before do
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.actions)
         end)
       end
-  
+
       it 'should render a form' do
-        output_buffer.should have_tag('form')
+        expect(output_buffer.to_str).to have_tag('form')
       end
-  
+
       it 'should render an actions fieldset inside the form' do
-        output_buffer.should have_tag('form fieldset.actions')
+        expect(output_buffer.to_str).to have_tag('form fieldset.actions')
       end
-  
+
       it 'should not render a legend in the fieldset' do
-        output_buffer.should_not have_tag('form fieldset.actions legend')
+        expect(output_buffer.to_str).not_to have_tag('form fieldset.actions legend')
       end
-  
+
       it 'should render an ol in the fieldset' do
-        output_buffer.should have_tag('form fieldset.actions ol')
+        expect(output_buffer.to_str).to have_tag('form fieldset.actions ol')
       end
-  
+
       it 'should render a list item in the ol for each default action' do
-        output_buffer.should have_tag('form fieldset.actions ol li.action.input_action', :count => 1)
+        expect(output_buffer.to_str).to have_tag('form fieldset.actions ol li.action.input_action', :count => 1)
       end
-  
+
     end
-  
+
     describe 'with button names as args' do
-    
+
       before do
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.actions(:submit, :cancel, :reset))
         end)
       end
-    
+
       it 'should render a form with a fieldset containing a list item for each button arg' do
-        output_buffer.should have_tag('form > fieldset.actions > ol > li.action', :count => 3)
+        expect(output_buffer.to_str).to have_tag('form > fieldset.actions > ol > li.action', :count => 3)
       end
-    
+
     end
-  
+
     describe 'with button names as args and an options hash' do
-    
+
      before do
        concat(semantic_form_for(@new_post) do |builder|
          concat(builder.actions(:submit, :cancel, :reset, :name => "Now click a button", :id => "my-id"))
        end)
      end
-    
+
      it 'should render a form with a fieldset containing a list item for each button arg' do
-       output_buffer.should have_tag('form > fieldset.actions > ol > li.action', :count => 3)
+       expect(output_buffer.to_str).to have_tag('form > fieldset.actions > ol > li.action', :count => 3)
      end
-    
+
      it 'should pass the options down to the fieldset' do
-       output_buffer.should have_tag('form > fieldset#my-id.actions')
+       expect(output_buffer.to_str).to have_tag('form > fieldset#my-id.actions')
      end
-    
+
      it 'should use the special :name option as a text for the legend tag' do
-       output_buffer.should have_tag('form > fieldset#my-id.actions > legend', /Now click a button/)
+       expect(output_buffer.to_str).to have_tag('form > fieldset#my-id.actions > legend', :text => /Now click a button/)
      end
-    
+
     end
-  
+
   end
-  
+
 end
 

data/spec/helpers/form_helper_spec.rb

@@ -1,12 +1,13 @@
 # encoding: utf-8
+# frozen_string_literal: true
 require 'spec_helper'
 
-describe 'FormHelper' do
+RSpec.describe 'FormHelper' do
 
   include FormtasticSpecHelper
 
   before do
-    @output_buffer = ''
+    @output_buffer = ActionView::OutputBuffer.new ''
     mock_everything
   end
 
@@ -14,45 +15,45 @@ describe 'FormHelper' do
 
     it 'yields an instance of Formtastic::FormBuilder' do
       semantic_form_for(@new_post, :url => '/hello') do |builder|
-        builder.class.should == Formtastic::FormBuilder
+        expect(builder.class).to eq(Formtastic::FormBuilder)
       end
     end
 
     it 'adds a class of "formtastic" to the generated form' do
       concat(semantic_form_for(@new_post, :url => '/hello') do |builder|
       end)
-      output_buffer.should have_tag("form.formtastic")
+      expect(output_buffer.to_str).to have_tag("form.formtastic")
     end
 
-    it 'adds a "novalidate" attribute to the generated form when configured to do so' do
+    it 'does not add "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|
         end)
-        output_buffer.should_not have_tag("form[@novalidate]")
+        expect(output_buffer.to_str).not_to have_tag("form[@novalidate]")
       end
     end
 
-    it 'omits a "novalidate" attribute to the generated form when configured to do so' do
+    it 'adds "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|
         end)
-        output_buffer.should have_tag("form[@novalidate]")
+        expect(output_buffer.to_str).to have_tag("form[@novalidate]")
       end
     end
 
-    it 'allows form HTML to override "novalidate" attribute when configure to not show' do
+    it 'allows form HTML to override "novalidate" attribute when configured to validate' do
       with_config :perform_browser_validations, false do
         concat(semantic_form_for(@new_post, :url => '/hello', :html => { :novalidate => true }) do |builder|
         end)
-        output_buffer.should have_tag("form[@novalidate]")
+        expect(output_buffer.to_str).to have_tag("form[@novalidate]")
       end
     end
 
-    it 'allows form HTML to override "novalidate" attribute when configure to show' do
+    it 'allows form HTML to override "novalidate" attribute when configured to not validate' do
       with_config :perform_browser_validations, true do
         concat(semantic_form_for(@new_post, :url => '/hello', :html => { :novalidate => false }) do |builder|
         end)
-        output_buffer.should_not have_tag("form[@novalidate]")
+        expect(output_buffer.to_str).not_to have_tag("form[@novalidate]")
       end
     end
 
@@ -60,103 +61,109 @@ describe 'FormHelper' do
       Formtastic::Helpers::FormHelper.default_form_class = 'xyz'
       concat(semantic_form_for(::Post.new, :as => :post, :url => '/hello') do |builder|
       end)
-      output_buffer.should have_tag("form.xyz")
+      expect(output_buffer.to_str).to 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|
       end)
-      output_buffer.should have_tag("form[class='post']")
+      expect(output_buffer.to_str).to have_tag("form[class='post']")
     end
 
     it 'adds class matching the object name to the generated form when a symbol is provided' do
       concat(semantic_form_for(@new_post, :url => '/hello') do |builder|
       end)
-      output_buffer.should have_tag("form.post")
+      expect(output_buffer.to_str).to have_tag("form.post")
 
       concat(semantic_form_for(:project, :url => '/hello') do |builder|
       end)
-      output_buffer.should have_tag("form.project")
+      expect(output_buffer.to_str).to have_tag("form.project")
     end
 
     it 'adds class matching the :as option when provided' do
       concat(semantic_form_for(@new_post, :as => :message, :url => '/hello') do |builder|
       end)
-      output_buffer.should have_tag("form.message")
+      expect(output_buffer.to_str).to have_tag("form.message")
 
       concat(semantic_form_for([:admins, @new_post], :as => :message, :url => '/hello') do |builder|
       end)
-      output_buffer.should have_tag("form.message")
+      expect(output_buffer.to_str).to have_tag("form.message")
     end
 
     it 'adds class matching the object\'s class to the generated form when an object is provided' do
       concat(semantic_form_for(@new_post) do |builder|
       end)
-      output_buffer.should have_tag("form.post")
+      expect(output_buffer.to_str).to have_tag("form.post")
     end
 
     it 'adds a namespaced class to the generated form' do
       concat(semantic_form_for(::Namespaced::Post.new, :url => '/hello') do |builder|
       end)
-      output_buffer.should have_tag("form.namespaced_post")
+      expect(output_buffer.to_str).to 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")
+      expect(output_buffer.to_str).to have_tag("form.post_form")
 
       concat(semantic_form_for(:project, :url => '/hello') do |builder|
       end)
-      output_buffer.should have_tag("form.project_form")
+      expect(output_buffer.to_str).to have_tag("form.project_form")
     end
 
     describe 'allows :html options' do
-      before(:each) do
+      before(:example) do
         concat(semantic_form_for(@new_post, :url => '/hello', :html => { :id => "something-special", :class => "something-extra", :multipart => true }) do |builder|
         end)
       end
 
       it 'to add a id of "something-special" to generated form' do
-        output_buffer.should have_tag("form#something-special")
+        expect(output_buffer.to_str).to have_tag("form#something-special")
       end
 
       it 'to add a class of "something-extra" to generated form' do
-        output_buffer.should have_tag("form.something-extra")
+        expect(output_buffer.to_str).to have_tag("form.something-extra")
       end
 
       it 'to add enctype="multipart/form-data"' do
-        output_buffer.should have_tag('form[@enctype="multipart/form-data"]')
+        expect(output_buffer.to_str).to have_tag('form[@enctype="multipart/form-data"]')
       end
     end
 
     it 'can be called with a resource-oriented style' do
       semantic_form_for(@new_post) do |builder|
-        builder.object.class.should == ::Post
-        builder.object_name.should == "post"
+        expect(builder.object.class).to eq(::Post)
+        expect(builder.object_name).to eq("post")
       end
     end
 
     it 'can be called with a generic style and instance variable' do
       semantic_form_for(@new_post, :as => :post, :url => new_post_path) do |builder|
-        builder.object.class.should == ::Post
-        builder.object_name.to_s.should == "post" # TODO: is this forced .to_s a bad assumption somewhere?
+        expect(builder.object.class).to eq(::Post)
+        expect(builder.object_name.to_s).to eq("post") # TODO: is this forced .to_s a bad assumption somewhere?
       end
     end
 
     it 'can be called with a generic style and inline object' do
       semantic_form_for(@new_post, :url => new_post_path) do |builder|
-        builder.object.class.should == ::Post
-        builder.object_name.to_s.should == "post" # TODO: is this forced .to_s a bad assumption somewhere?
+        expect(builder.object.class).to eq(::Post)
+        expect(builder.object_name.to_s).to eq("post") # TODO: is this forced .to_s a bad assumption somewhere?
       end
     end
 
     describe 'ActionView::Base.field_error_proc' do
+      around do |ex|
+        error_proc = Formtastic::Helpers::FormHelper.formtastic_field_error_proc
+        ex.run
+        Formtastic::Helpers::FormHelper.formtastic_field_error_proc = error_proc
+      end
+
       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"
+          expect(::ActionView::Base.field_error_proc.call("html", nil)).to eq("html")
         end
       end
 
@@ -164,15 +171,15 @@ describe 'FormHelper' do
         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
+          expect(::ActionView::Base.field_error_proc).to eq(field_error_proc)
         end
       end
 
       it 'is restored to its original value after the form is rendered' do
-        lambda do
+        expect 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.not_to change(::ActionView::Base, :field_error_proc)
       end
     end
 
@@ -181,7 +188,7 @@ describe 'FormHelper' do
         class MyAwesomeCustomBuilder < Formtastic::FormBuilder
         end
         semantic_form_for(@new_post, :url => '/hello', :builder => MyAwesomeCustomBuilder) do |builder|
-          builder.class.should == MyAwesomeCustomBuilder
+          expect(builder.class).to eq(MyAwesomeCustomBuilder)
         end
       end
     end
@@ -209,7 +216,7 @@ describe 'FormHelper' do
   describe '#semantic_fields_for' do
     it 'yields an instance of Formtastic::FormBuilder' do
       semantic_fields_for(@new_post) do |builder|
-        builder.class.should.kind_of?(Formtastic::FormBuilder)
+        expect(builder.class).to be(Formtastic::FormBuilder)
       end
     end
   end