formtastic 3.1.3 → 5.0.0

data/spec/inputs/color_input_spec.rb

@@ -1,94 +1,83 @@
 # encoding: utf-8
+# frozen_string_literal: true
 require 'spec_helper'
 
-describe 'color input' do
+RSpec.describe 'color input' do
 
   include FormtasticSpecHelper
 
   before do
-    @output_buffer = ''
+    @output_buffer = ActionView::OutputBuffer.new ''
     mock_everything
   end
 
-  if Formtastic::Util.rails3?
-    describe "attempting to use color input with Rails 3" do
-      it "raises an error" do
-        expect {
-          concat(semantic_form_for(@new_post) do |builder|
-            concat(builder.input(:color))
-          end)
-        }.to raise_error "The :color input requires the color_field form helper, which is only available in Rails 4+"
-      end
+  describe "when object is provided" do
+    before do
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:color))
+      end)
     end
-  else
-    describe "when object is provided" do
-      before do
-        concat(semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:color))
-        end)
-      end
 
-      it_should_have_input_wrapper_with_class(:color)
-      it_should_have_input_wrapper_with_class(:input)
-      it_should_have_input_wrapper_with_class(:stringish)
-      it_should_have_input_wrapper_with_id("post_color_input")
-      it_should_have_label_with_text(/Color/)
-      it_should_have_label_for("post_color")
-      it_should_have_input_with_id("post_color")
-      it_should_have_input_with_type(:color)
-      it_should_have_input_with_name("post[color]")
+    it_should_have_input_wrapper_with_class(:color)
+    it_should_have_input_wrapper_with_class(:input)
+    it_should_have_input_wrapper_with_class(:stringish)
+    it_should_have_input_wrapper_with_id("post_color_input")
+    it_should_have_label_with_text(/Color/)
+    it_should_have_label_for("post_color")
+    it_should_have_input_with_id("post_color")
+    it_should_have_input_with_type(:color)
+    it_should_have_input_with_name("post[color]")
 
-    end
+  end
 
-    describe "when namespace is provided" do
+  describe "when namespace is provided" do
 
-      before do
-        concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
-          concat(builder.input(:color))
-        end)
-      end
+    before do
+      concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
+        concat(builder.input(:color))
+      end)
+    end
 
-      it_should_have_input_wrapper_with_id("context2_post_color_input")
-      it_should_have_label_and_input_with_id("context2_post_color")
+    it_should_have_input_wrapper_with_id("context2_post_color_input")
+    it_should_have_label_and_input_with_id("context2_post_color")
 
-    end
+  end
 
-    describe "when index is provided" do
+  describe "when index is provided" do
 
-      before do
-        @output_buffer = ''
-        mock_everything
+    before do
+      @output_buffer = ActionView::OutputBuffer.new ''
+      mock_everything
 
-        concat(semantic_form_for(@new_post) do |builder|
-          concat(builder.fields_for(:author, :index => 3) do |author|
-            concat(author.input(:name, :as => :color))
-          end)
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.fields_for(:author, :index => 3) do |author|
+          concat(author.input(:name, :as => :color))
         end)
-      end
-
-      it 'should index the id of the wrapper' do
-        output_buffer.should have_tag("li#post_author_attributes_3_name_input")
-      end
+      end)
+    end
 
-      it 'should index the id of the select tag' do
-        output_buffer.should have_tag("input#post_author_attributes_3_name")
-      end
+    it 'should index the id of the wrapper' do
+      expect(output_buffer.to_str).to have_tag("li#post_author_attributes_3_name_input")
+    end
 
-      it 'should index the name of the select tag' do
-        output_buffer.should have_tag("input[@name='post[author_attributes][3][name]']")
-      end
+    it 'should index the id of the select tag' do
+      expect(output_buffer.to_str).to have_tag("input#post_author_attributes_3_name")
+    end
 
+    it 'should index the name of the select tag' do
+      expect(output_buffer.to_str).to have_tag("input[@name='post[author_attributes][3][name]']")
     end
 
+  end
+
 
-    describe "when required" do
-      it "should add the required attribute to the input's html options" do
-        with_config :use_required_attribute, true do
-          concat(semantic_form_for(@new_post) do |builder|
-            concat(builder.input(:title, :as => :color, :required => true))
-          end)
-          output_buffer.should have_tag("input[@required]")
-        end
+  describe "when required" do
+    it "should add the required attribute to the input's html options" do
+      with_config :use_required_attribute, true do
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:title, :as => :color, :required => true))
+        end)
+        expect(output_buffer.to_str).to have_tag("input[@required]")
       end
     end
   end

data/spec/inputs/country_input_spec.rb

@@ -1,23 +1,24 @@
 # encoding: utf-8
+# frozen_string_literal: true
 require 'spec_helper'
 
-describe 'country input' do
+RSpec.describe 'country input' do
 
   include FormtasticSpecHelper
 
   before do
-    @output_buffer = ''
+    @output_buffer = ActionView::OutputBuffer.new ''
     mock_everything
   end
 
   describe "when country_select is not available as a helper from a plugin" do
 
     it "should raise an error, sugesting the author installs a plugin" do
-      lambda {
+      expect {
         semantic_form_for(@new_post) do |builder|
           concat(builder.input(:country, :as => :country))
         end
-      }.should raise_error
+      }.to raise_error(Formtastic::Inputs::CountryInput::CountrySelectPluginMissing)
     end
 
   end
@@ -26,7 +27,7 @@ describe 'country input' do
 
     before do
       concat(semantic_form_for(@new_post) do |builder|
-        builder.stub(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
+        allow(builder).to receive(:country_select).and_return("<select><option>...</option></select>".html_safe)
         concat(builder.input(:country, :as => :country))
       end)
     end
@@ -39,13 +40,13 @@ describe 'country input' do
     #it_should_apply_error_logic_for_input_type(:country)
 
     it 'should generate a label for the input' do
-      output_buffer.should have_tag('form li label')
-      output_buffer.should have_tag('form li label[@for="post_country"]')
-      output_buffer.should have_tag('form li label', /Country/)
+      expect(output_buffer.to_str).to have_tag('form li label')
+      expect(output_buffer.to_str).to have_tag('form li label[@for="post_country"]')
+      expect(output_buffer.to_str).to have_tag('form li label', :text => /Country/)
     end
 
     it "should generate a select" do
-      output_buffer.should have_tag("form li select")
+      expect(output_buffer.to_str).to have_tag("form li select")
     end
 
   end
@@ -55,8 +56,8 @@ describe 'country input' do
     it "should be passed down to the country_select helper when provided" do
       priority_countries = ["Foo", "Bah"]
       semantic_form_for(@new_post) do |builder|
-        builder.stub(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
-        builder.should_receive(:country_select).with(:country, priority_countries, {}, {:id => "post_country", :required => false, :autofocus => false}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
+        allow(builder).to receive(:country_select).and_return("<select><option>...</option></select>".html_safe)
+        expect(builder).to receive(:country_select).with(:country, priority_countries, {}, {:id => "post_country", :required => false, :autofocus => false, :readonly => false}).and_return("<select><option>...</option></select>".html_safe)
 
         concat(builder.input(:country, :as => :country, :priority_countries => priority_countries))
       end
@@ -64,12 +65,12 @@ describe 'country input' do
 
     it "should default to the @@priority_countries config when absent" do
       priority_countries = Formtastic::FormBuilder.priority_countries
-      priority_countries.should_not be_empty
-      priority_countries.should_not be_nil
+      expect(priority_countries).not_to be_empty
+      expect(priority_countries).not_to be_nil
 
       semantic_form_for(@new_post) do |builder|
-        builder.stub(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
-        builder.should_receive(:country_select).with(:country, priority_countries, {}, {:id => "post_country", :required => false, :autofocus => false}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
+        allow(builder).to receive(:country_select).and_return("<select><option>...</option></select>".html_safe)
+        expect(builder).to receive(:country_select).with(:country, priority_countries, {}, {:id => "post_country", :required => false, :autofocus => false, :readonly => false}).and_return("<select><option>...</option></select>".html_safe)
 
         concat(builder.input(:country, :as => :country))
       end
@@ -80,12 +81,12 @@ describe 'country input' do
   describe "when namespace is provided" do
 
     before do
-      @output_buffer = ''
+      @output_buffer = ActionView::OutputBuffer.new ''
       mock_everything
 
       concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
-        builder.stub(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
-        builder.should_receive(:country_select).with(:country, [], {}, {:id => "context2_post_country", :required => false, :autofocus => false}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
+        allow(builder).to receive(:country_select).and_return("<select><option>...</option></select>".html_safe)
+        expect(builder).to receive(:country_select).with(:country, [], {}, {:id => "context2_post_country", :required => false, :autofocus => false, :readonly => false}).and_return("<select><option>...</option></select>".html_safe)
         concat(builder.input(:country, :priority_countries => []))
       end)
     end
@@ -101,13 +102,13 @@ describe 'country input' do
 
       before do
         concat(semantic_form_for(@new_post) do |builder|
-          builder.stub(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
+          allow(builder).to receive(:country_select).and_return("<select><option>...</option></select>".html_safe)
           concat(builder.input(:country))
         end)
       end
 
       it "should render a country input" do
-        output_buffer.should have_tag "form li.country"
+        expect(output_buffer.to_str).to have_tag "form li.country"
       end
     end
 
@@ -121,8 +122,8 @@ describe 'country input' do
       end
 
       it "should render a country input" do
-        output_buffer.should_not have_tag "form li.country"
-        output_buffer.should have_tag "form li.string", :count => 2
+        expect(output_buffer.to_str).not_to have_tag "form li.country"
+        expect(output_buffer.to_str).to have_tag "form li.string", :count => 2
       end
 
     end

data/spec/inputs/custom_input_spec.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 require 'spec_helper'
 
 # TODO extract out
@@ -11,11 +12,7 @@ module TestInputs
     @method = :title
     @options = {}
     @proc = Proc.new {}
-    if Rails::VERSION::MAJOR == 4
-      @builder = Formtastic::FormBuilder.new(@object_name, @object, @template, @options)
-    else
-      @builder = Formtastic::FormBuilder.new(@object_name, @object, @template, @options, @proc)
-    end
+    @builder = Formtastic::FormBuilder.new(@object_name, @object, @template, @options)
     [@builder, @template, @object, @object_name, @method, @options]
   end
   
@@ -31,7 +28,7 @@ module TestInputs
   
 end
 
-describe 'AnyCustomInput' do
+RSpec.describe 'AnyCustomInput' do
   
   include TestInputs
   

data/spec/inputs/datalist_input_spec.rb

@@ -1,11 +1,12 @@
 # encoding: utf-8
+# frozen_string_literal: true
 require 'spec_helper'
 
-describe "datalist inputs" do
+RSpec.describe "datalist inputs" do
   include FormtasticSpecHelper
 
   before do
-    @output_buffer = ''
+    @output_buffer = ActionView::OutputBuffer.new ''
     mock_everything
   end