formtastic 5.0.0 → 6.0.0

data/spec/action_class_finder_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 require 'spec_helper'
 require 'formtastic/action_class_finder'

data/spec/actions/button_action_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 require 'spec_helper'
 

data/spec/actions/generic_action_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 require 'spec_helper'
 
@@ -74,7 +73,7 @@ RSpec.describe 'InputAction::Base' do
         end)
       end
 
-      it "should add the custom class strng to the existing classes" do
+      it "should add the custom class string to the existing classes" do
         expect(output_buffer.to_str).to have_tag('li.action.generic_action.foo_bah_bing')
       end
 
@@ -90,7 +89,7 @@ RSpec.describe 'InputAction::Base' do
         end)
       end
 
-      it "should add the custom class strng to the existing classes" do
+      it "should add the custom class string to the existing classes" do
         expect(output_buffer.to_str).to have_tag('li.action.generic_action.foo_bah_bing.zing_boo')
       end
 

data/spec/actions/input_action_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 require 'spec_helper'
 

data/spec/actions/link_action_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 require 'spec_helper'
 

data/spec/builder/custom_builder_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 require 'spec_helper'
 

data/spec/builder/error_proc_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 require 'spec_helper'
 

data/spec/builder/semantic_fields_for_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 require 'spec_helper'
 
@@ -112,7 +111,6 @@ RSpec.describe 'Formtastic::FormBuilder#fields_for' do
       end)
       expect(output_buffer.to_str).to match(/oh noes/)
     end
-
   end
 
   context "when I rendered my own hidden id input" do
@@ -140,4 +138,76 @@ RSpec.describe 'Formtastic::FormBuilder#fields_for' do
     end
   end
 
+  context "when FormBuilder.semantic_errors_link_to_inputs is true" do
+    before do
+      Formtastic::FormBuilder.semantic_errors_link_to_inputs = true
+    end
+
+    after do
+      Formtastic::FormBuilder.semantic_errors_link_to_inputs = false
+    end
+
+    context "when there are errors" do
+      before do
+        @errors = double('errors')
+        allow(@errors).to receive(:[]).with(errors_matcher(:login)).and_return(['oh noes'])
+        allow(@errors).to receive(:[]).with(errors_matcher(:name)).and_return([])
+        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, :name))
+          end)
+        end)
+      end
+
+      it 'should render errors on the nested inputs with default aria attributes' do
+        expect(output_buffer.to_str).to include('aria-invalid="true"')
+        expect(output_buffer.to_str).to \
+          have_tag 'input#context2_post_author_login[aria-describedby="login_error"]', \
+          count: 1
+      end
+
+      it 'should preserve developer-set aria attributes' do
+        concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
+          concat(builder.semantic_fields_for(@bob) do |nested_builder|
+            concat(nested_builder.input(:login, input_html: { 'aria-describedby': 'hint_for_email_field', 'aria-invalid': 'false' } ))
+          end)
+        end)
+
+        expect(output_buffer.to_str).to \
+          have_tag 'input#context2_post_author_login[aria-describedby="hint_for_email_field login_error"]', \
+          count: 1
+        expect(output_buffer.to_str).to \
+          have_tag 'input#context2_post_author_login[aria-invalid="false"]', \
+          count: 1
+      end
+    end
+
+    context "when there are no errors" do
+      before do
+        concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
+          concat(builder.semantic_fields_for(@bob) do |nested_builder|
+            concat(nested_builder.input(:login))
+          end)
+        end)
+      end
+
+      it 'should not aria attributes on nested inputs' do
+        expect(output_buffer.to_str).not_to include('aria-invalid')
+        expect(output_buffer.to_str).not_to include('aria-describedby')
+      end
+
+      it 'should render aria attributes I set' do
+        concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
+          concat(builder.semantic_fields_for(@bob) do |nested_builder|
+            concat(nested_builder.input(:login, input_html: { 'aria-describedby': 'hint_for_email_field', 'aria-invalid': 'false' } ))
+          end)
+        end)
+
+        expect(output_buffer.to_str).to include('aria-describedby="hint_for_email_field"')
+        expect(output_buffer.to_str).to include('aria-invalid="false"')
+      end
+    end
+  end
 end

data/spec/fast_spec_helper.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 $LOAD_PATH << 'lib/formtastic'
 require 'active_support/all'

data/spec/generators/formtastic/stylesheets/stylesheets_generator_spec.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+# Generators are not automatically loaded by Rails
+require 'generators/formtastic/stylesheets/stylesheets_generator'
+
+RSpec.describe Formtastic::StylesheetsGenerator do
+  # Tell the generator where to put its output (what it thinks of as Rails.root)
+  destination File.expand_path("../../../../../tmp", __FILE__)
+
+  before { prepare_destination }
+
+  describe 'no arguments' do
+    before { run_generator  }
+
+    describe 'app/assets/stylesheets/formtastic.css' do
+      subject { file('app/assets/stylesheets/formtastic.css') }
+      it { is_expected.to exist }
+      it { is_expected.to contain ".formtastic" }
+    end
+  end
+end

data/spec/helpers/actions_helper_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 require 'spec_helper'
 

data/spec/helpers/form_helper_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 require 'spec_helper'
 

data/spec/helpers/input_helper_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 require 'spec_helper'
 
@@ -492,6 +491,7 @@ RSpec.describe 'with input class finder' do
         it 'should default to :datetime_select for :datetime and :timestamp column types' do
           expect(default_input_type(:datetime)).to eq(:datetime_select)
           expect(default_input_type(:timestamp)).to eq(:datetime_select)
+          expect(default_input_type(:timestamptz)).to eq(:datetime_select)
         end
 
         it 'should default to :time_select for :time column types' do
@@ -731,6 +731,17 @@ RSpec.describe 'with input class finder' do
 
     end
 
+    describe ':label_method option' do
+      it "should allow label_html to add custom attributes" do
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:title, :label_html => { :data => { :tooltip => 'Great Tooltip' } }))
+        end)
+        aggregate_failures do
+          expect(output_buffer.to_str).to have_tag('form li label[data-tooltip="Great Tooltip"]')
+        end
+      end
+    end
+
     describe ':hint option' do
 
       describe 'when provided' do

data/spec/helpers/inputs_helper_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 require 'spec_helper'
 
@@ -138,7 +137,7 @@ RSpec.describe 'Formtastic::FormBuilder#inputs' do
         end
       end
 
-      describe 'as an array containing the a symbole for the association name and the associated object' do
+      describe 'as an array containing the a symbol for the association name and the associated object' do
 
         it 'should nest the inputs with an _attributes suffix on the association name' do
           concat(semantic_form_for(@new_post) do |post|

data/spec/helpers/reflection_helper_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 require 'spec_helper'
 

data/spec/helpers/semantic_errors_helper_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 require 'spec_helper'
 
@@ -11,7 +10,7 @@ RSpec.describe 'Formtastic::FormBuilder#semantic_errors' do
     mock_everything
     @title_errors = ['must not be blank', 'must be awesome']
     @base_errors = ['base error message', 'nasty error']
-    @base_error = 'one base error'
+    @base_error = ['one base error']
     @errors = double('errors')
     allow(@new_post).to receive(:errors).and_return(@errors)
   end
@@ -23,7 +22,7 @@ RSpec.describe 'Formtastic::FormBuilder#semantic_errors' do
 
     it 'should render an unordered list' do
       semantic_form_for(@new_post) do |builder|
-        expect(builder.semantic_errors).to have_tag('ul.errors li', :text => @base_error)
+        expect(builder.semantic_errors).to have_tag('ul.errors li', text: 'one base error')
       end
     end
   end
@@ -67,15 +66,15 @@ RSpec.describe 'Formtastic::FormBuilder#semantic_errors' do
       semantic_form_for(@new_post) do |builder|
         title_name = builder.send(:localized_string, :title, :title, :label) || builder.send(:humanized_attribute_name, :title)
         expect(builder.semantic_errors(:title)).to have_tag('ul.errors li', :text => title_name << " " << @title_errors.to_sentence)
-        expect(builder.semantic_errors(:title)).to have_tag('ul.errors li', :text => @base_error)
+        expect(builder.semantic_errors(:title)).to have_tag('ul.errors li', text: 'one base error')
       end
     end
   end
 
   describe 'when there are no errors' do
     before do
-      allow(@errors).to receive(:[]).with(errors_matcher(:title)).and_return(nil)
-      allow(@errors).to receive(:[]).with(errors_matcher(:base)).and_return(nil)
+      allow(@errors).to receive(:[]).with(errors_matcher(:title)).and_return([])
+      allow(@errors).to receive(:[]).with(errors_matcher(:base)).and_return([])
     end
 
     it 'should return nil' do
@@ -92,7 +91,7 @@ RSpec.describe 'Formtastic::FormBuilder#semantic_errors' do
 
     it 'should render an unordered list with given class' do
       semantic_form_for(@new_post) do |builder|
-        expect(builder.semantic_errors(:class => "awesome")).to have_tag('ul.awesome li', :text => @base_error)
+        expect(builder.semantic_errors(:class => "awesome")).to have_tag('ul.awesome li', text: 'one base error')
       end
     end
   end
@@ -110,4 +109,112 @@ RSpec.describe 'Formtastic::FormBuilder#semantic_errors' do
     end
   end
 
+  context 'when configure FormBuilder.semantic_errors_link_to_inputs is true' do
+    before do
+      Formtastic::FormBuilder.semantic_errors_link_to_inputs = true
+    end
+
+    after do
+      Formtastic::FormBuilder.semantic_errors_link_to_inputs = false
+    end
+
+
+    describe 'when there is only one error on base' do
+      before do
+        allow(@errors).to receive(:[]).with(errors_matcher(:base)).and_return(@base_error)
+      end
+
+      it 'should render an unordered list' do
+        semantic_form_for(@new_post) do |builder|
+          expect(builder.semantic_errors).to have_tag('ul.errors li', text: 'one base error')
+        end
+      end
+    end
+
+    describe 'when there is more than one error on base' do
+      before do
+        allow(@errors).to receive(:[]).with(errors_matcher(:base)).and_return(@base_errors)
+      end
+
+      it 'should render an unordered list' do
+        semantic_form_for(@new_post) do |builder|
+          expect(builder.semantic_errors).to have_tag('ul.errors')
+          @base_errors.each do |error|
+            expect(builder.semantic_errors).to have_tag('ul.errors li', :text => error)
+          end
+        end
+      end
+    end
+
+    describe 'when there are errors on title' do
+      before do
+        allow(@errors).to receive(:[]).with(errors_matcher(:title)).and_return(@title_errors)
+        allow(@errors).to receive(:[]).with(errors_matcher(:base)).and_return([])
+      end
+
+      it 'should render an unordered list' do
+        semantic_form_for(@new_post) do |builder|
+          title_name = builder.send(:localized_string, :title, :title, :label) || builder.send(:humanized_attribute_name, :title)
+          expect(builder.semantic_errors(:title)).to have_tag('ul.errors li a', :text => title_name << " " << @title_errors.to_sentence)
+        end
+      end
+    end
+
+    describe 'when there are errors on title and base' do
+      before do
+        allow(@errors).to receive(:[]).with(errors_matcher(:title)).and_return(@title_errors)
+        allow(@errors).to receive(:[]).with(errors_matcher(:base)).and_return(@base_error)
+      end
+
+      it 'should render an unordered list where base has no link, and title error attribute links to title input field' do
+        semantic_form_for(@new_post) do |builder|
+          title_name = builder.send(:localized_string, :title, :title, :label) || builder.send(:humanized_attribute_name, :title)
+          expect(builder.semantic_errors(:title)).to \
+            have_tag('ul.errors li a',
+              with: { href: "##{@new_post.model_name}_title" },
+              text: title_name << " " << @title_errors.to_sentence
+            )
+          expect(builder.semantic_errors(:title)).to have_tag('ul.errors li', text: 'one base error')
+        end
+      end
+    end
+
+    describe 'when there are no errors' do
+      before do
+        allow(@errors).to receive(:[]).with(errors_matcher(:title)).and_return([])
+        allow(@errors).to receive(:[]).with(errors_matcher(:base)).and_return([])
+      end
+
+      it 'should return nil' do
+        semantic_form_for(@new_post) do |builder|
+          expect(builder.semantic_errors(:title)).to be_nil
+        end
+      end
+    end
+
+    describe 'when there is one error on base and options with class is passed' do
+      before do
+        allow(@errors).to receive(:[]).with(errors_matcher(:base)).and_return(@base_error)
+      end
+
+      it 'should render an unordered list with given class' do
+        semantic_form_for(@new_post) do |builder|
+          expect(builder.semantic_errors(class: "awesome")).to have_tag('ul.awesome li', text: 'one base error')
+        end
+      end
+    end
+
+    describe 'when :base is passed in as an argument' do
+      before do
+        allow(@errors).to receive(:[]).with(errors_matcher(:base)).and_return(@base_error)
+      end
+
+      it 'should ignore :base and only render base errors once' do
+        semantic_form_for(@new_post) do |builder|
+          expect(builder.semantic_errors(:base)).to have_tag('ul li', count: 1)
+          expect(builder.semantic_errors(:base)).not_to have_tag('ul li', text: "Base #{@base_error}")
+        end
+      end
+    end
+  end # context 'when semantic_errors_link_to_inputs is true'
 end

data/spec/i18n_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 require 'spec_helper'
 
@@ -88,7 +87,7 @@ RSpec.describe 'Formtastic::I18n' do
 
       ::I18n.backend.store_translations :en, {:formtastic => {
           :labels => {
-              :author   => { :name => "Top author name transation" },
+              :author   => { :name => "Top author name translation" },
               :post     => {:title => "Hello post!", :author => {:name => "Hello author name!"}},
               :project  => {:title => "Hello project!"},
             }

data/spec/input_class_finder_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 require 'spec_helper'
 require 'formtastic/input_class_finder'

data/spec/inputs/base/collections_spec.rb

@@ -74,5 +74,46 @@ RSpec.describe MyInput do
     end
   end
 
+  describe '#collection' do
+    context 'when the raw collection is a string' do
+      it 'returns the string' do
+        allow(instance).to receive(:raw_collection).and_return("one_status_only")
+        expect(instance.collection).to eq "one_status_only"
+      end
+    end
+
+    context 'when the raw collection is an array of strings' do
+      it 'returns the array of symbols' do
+        allow(instance).to receive(:raw_collection).and_return(["active", "inactive", "pending"])
+        expect(instance.collection).to be_an(Array)
+        expect(instance.collection).to eq ["active", "inactive", "pending"]
+      end
+    end
+
+    context 'when the raw collection is an array of arrays' do
+      it 'returns the array of arrays' do
+        allow(instance).to receive(:raw_collection).and_return([["inactive", "0"], ["active", "1"], ["pending", "2"]])
+        expect(instance.collection).to be_an(Array)
+        expect(instance.collection).to eq [["inactive", "0"], ["active", "1"], ["pending", "2"]]
+      end
+    end
+
+    context 'when the raw collection is an array of symbols' do
+      it 'returns the array of symbols' do
+        allow(instance).to receive(:raw_collection).and_return([:active, :inactive, :pending])
+        expect(instance.collection).to be_an(Array)
+        expect(instance.collection).to eq [:active, :inactive, :pending]
+      end
+    end
+
+    context 'when the raw collection is a hash' do
+      it 'will be mapped into array form' do
+        allow(instance).to receive(:raw_collection).and_return({ inactive: 0, active: 1, pending: 2 })
+        expect(instance.collection).to be_an(Array)
+        expect(instance.collection).to eq [[:inactive, 0], [:active, 1], [:pending, 2]]
+      end
+    end
+  end
+
 end
 

data/spec/inputs/boolean_input_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 require 'spec_helper'
 

data/spec/inputs/check_boxes_input_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 require 'spec_helper'
 
@@ -510,7 +509,7 @@ RSpec.describe 'check_boxes input' do
     end
 
     it "should not check any items" do
-      expect(output_buffer.to_str).to have_tag('form li input[@checked]', :count => 0)
+      expect(output_buffer.to_str).not_to have_tag('form li input[@checked]')
     end
 
     describe "and the attribute has values" do

data/spec/inputs/color_input_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 require 'spec_helper'
 

data/spec/inputs/country_input_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 require 'spec_helper'
 
@@ -13,7 +12,7 @@ RSpec.describe 'country input' do
 
   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
+    it "should raise an error, suggesting the author installs a plugin" do
       expect {
         semantic_form_for(@new_post) do |builder|
           concat(builder.input(:country, :as => :country))
@@ -57,7 +56,7 @@ RSpec.describe 'country input' do
       priority_countries = ["Foo", "Bah"]
       semantic_form_for(@new_post) do |builder|
         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)
+        expect(builder).to receive(:country_select).with(:country, { :priority_countries => 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
@@ -70,7 +69,7 @@ RSpec.describe 'country input' do
 
       semantic_form_for(@new_post) do |builder|
         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)
+        expect(builder).to receive(:country_select).with(:country, { :priority_countries => 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
@@ -86,7 +85,7 @@ RSpec.describe 'country input' do
 
       concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
         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)
+        expect(builder).to receive(:country_select).with(:country, { :priority_countries => [] }, {: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
@@ -112,7 +111,7 @@ RSpec.describe 'country input' do
       end
     end
 
-    describe "whent the attribute is 'country_something'" do
+    describe "when the attribute is 'country_something'" do
 
       before do
         concat(semantic_form_for(@new_post) do |builder|

data/spec/inputs/custom_input_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 require 'spec_helper'
 

data/spec/inputs/datalist_input_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 require 'spec_helper'
 

data/spec/inputs/date_picker_input_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 require 'spec_helper'
 

data/spec/inputs/date_select_input_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 require 'spec_helper'
 
@@ -154,7 +153,7 @@ RSpec.describe 'date select input' do
       concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:created_at, :as => :date_select, :labels => false))
       end)
-      expect(output_buffer.to_str).to have_tag('form li.date_select fieldset ol li label', :count => 0)
+      expect(output_buffer.to_str).not_to have_tag('form li.date_select fieldset ol li label')
     end
   end
 

data/spec/inputs/datetime_picker_input_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 require 'spec_helper'
 

data/spec/inputs/datetime_select_input_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 require 'spec_helper'
 
@@ -163,7 +162,7 @@ RSpec.describe 'datetime select input' do
       concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:created_at, :as => :datetime_select, :labels => false))
       end)
-      expect(output_buffer.to_str).to have_tag('form li.datetime_select fieldset ol li label', :count => 0)
+      expect(output_buffer.to_str).not_to have_tag('form li.datetime_select fieldset ol li label')
     end
   end
 

data/spec/inputs/email_input_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 require 'spec_helper'
 

data/spec/inputs/file_input_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 require 'spec_helper'
 

data/spec/inputs/hidden_input_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 require 'spec_helper'
 

data/spec/inputs/include_blank_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 require 'spec_helper'