simple_form 2.0.0 → 3.5.1

data/test/inputs/datetime_input_test.rb

@@ -1,19 +1,75 @@
+# frozen_string_literal: true
 # encoding: UTF-8
 require 'test_helper'
 
-# Tests for all different kinds of inputs.
-class DateTimeInputTest < ActionView::TestCase
-  # DateTime input
-  test 'input should generate a datetime select by default for datetime attributes' do
+# Tests for datetime, date and time inputs when HTML5 compatibility is enabled in the wrapper.
+class DateTimeInputWithHtml5Test < ActionView::TestCase
+  test 'input generates a datetime input for datetime attributes if HTML5 compatibility is explicitly enbled' do
+    with_input_for @user, :created_at, :datetime, html5: true
+
+    if ActionPack::VERSION::STRING >= '5'
+      assert_select 'input[type="datetime-local"]'
+    elsif ActionPack::VERSION::STRING < '5'
+      assert_select 'input[type="datetime"]'
+    end
+  end
+
+  test 'input generates a datetime select for datetime attributes' do
     with_input_for @user, :created_at, :datetime
-    1.upto(5) do |i|
-      assert_select "form select.datetime#user_created_at_#{i}i"
+
+    assert_select 'select.datetime'
+  end
+
+  test 'input generates a date input for date attributes if HTML5 compatibility is explicitly enbled' do
+    with_input_for @user, :born_at, :date, html5: true
+
+    assert_select 'input[type="date"]'
+  end
+
+  test 'input generates a date select for date attributes' do
+    with_input_for @user, :born_at, :date
+
+    assert_select 'select.date'
+  end
+
+  test 'input generates a time input for time attributes if HTML5 compatibility is explicitly enbled' do
+    with_input_for @user, :delivery_time, :time, html5: true
+
+    assert_select 'input[type="time"]'
+  end
+
+  test 'input generates a time select for time attributes' do
+    with_input_for @user, :delivery_time, :time
+
+    assert_select 'select.time'
+  end
+
+  test 'input generates required html attribute' do
+    with_input_for @user, :delivery_time, :time, required: true, html5: true
+    assert_select 'input.required'
+    assert_select 'input[required]'
+  end
+
+  test 'input has an aria-required html attribute' do
+    with_input_for @user, :delivery_time, :time, required: true, html5: true
+    assert_select 'input[aria-required=true]'
+  end
+end
+
+# Tests for datetime, date and time inputs when HTML5 compatibility is enabled in the wrapper.
+class DateTimeInputWithoutHtml5Test < ActionView::TestCase
+  test 'input generates a datetime select by default for datetime attributes' do
+    swap_wrapper do
+      with_input_for @user, :created_at, :datetime
+      1.upto(5) do |i|
+        assert_select "form select.datetime#user_created_at_#{i}i"
+      end
     end
   end
 
-  test 'input should be able to pass options to datetime select' do
-    with_input_for @user, :created_at, :datetime,
-      :disabled => true, :prompt => { :year => 'ano', :month => 'mês', :day => 'dia' }
+  test 'input is able to pass options to datetime select' do
+    with_input_for @user, :created_at, :datetime, html5: false,
+      disabled: true, prompt: { year: 'ano', month: 'mês', day: 'dia' }
 
     assert_select 'select.datetime[disabled=disabled]'
     assert_select 'select.datetime option', 'ano'
@@ -21,17 +77,31 @@ class DateTimeInputTest < ActionView::TestCase
     assert_select 'select.datetime option', 'dia'
   end
 
-  test 'input should generate a date select for date attributes' do
-    with_input_for @user, :born_at, :date
-    assert_select 'select.date#user_born_at_1i'
-    assert_select 'select.date#user_born_at_2i'
-    assert_select 'select.date#user_born_at_3i'
-    assert_no_select 'select.date#user_born_at_4i'
+  test 'input generates a datetime input for datetime attributes if HTML5 compatibility is explicitly enabled' do
+    swap_wrapper do
+      with_input_for @user, :created_at, :datetime, html5: true
+
+      if ActionPack::VERSION::STRING >= '5'
+        assert_select 'input[type="datetime-local"]'
+      elsif ActionPack::VERSION::STRING < '5'
+        assert_select 'input[type="datetime"]'
+      end
+    end
+  end
+
+  test 'input generates a date select for date attributes' do
+    swap_wrapper do
+      with_input_for @user, :born_at, :date
+      assert_select 'select.date#user_born_at_1i'
+      assert_select 'select.date#user_born_at_2i'
+      assert_select 'select.date#user_born_at_3i'
+      assert_no_select 'select.date#user_born_at_4i'
+    end
   end
 
-  test 'input should be able to pass options to date select' do
-    with_input_for @user, :born_at, :date, :as => :date,
-      :disabled => true, :prompt => { :year => 'ano', :month => 'mês', :day => 'dia' }
+  test 'input is able to pass options to date select' do
+    with_input_for @user, :born_at, :date, as: :date, html5: false,
+      disabled: true, prompt: { year: 'ano', month: 'mês', day: 'dia' }
 
     assert_select 'select.date[disabled=disabled]'
     assert_select 'select.date option', 'ano'
@@ -39,61 +109,78 @@ class DateTimeInputTest < ActionView::TestCase
     assert_select 'select.date option', 'dia'
   end
 
-  test 'input should be able to pass :default to date select' do
-    with_input_for @user, :born_at, :date, :default => Date.today
-    assert_select "select.date option[value=#{Date.today.year}][selected=selected]"
+  test 'input is able to pass :default to date select' do
+    with_input_for @user, :born_at, :date, default: Date.today, html5: false
+    assert_select "select.date option[value='#{Date.today.year}'][selected=selected]"
   end
 
-  test 'input should generate a time select for time attributes' do
-    with_input_for @user, :delivery_time, :time
-    assert_select 'input[type=hidden]#user_delivery_time_1i'
-    assert_select 'input[type=hidden]#user_delivery_time_2i'
-    assert_select 'input[type=hidden]#user_delivery_time_3i'
-    assert_select 'select.time#user_delivery_time_4i'
-    assert_select 'select.time#user_delivery_time_5i'
+  test 'input generates a date input for date attributes if HTML5 compatibility is explicitly enabled' do
+    swap_wrapper do
+      with_input_for @user, :born_at, :date, html5: true
+
+      assert_select 'input[type="date"]'
+    end
+  end
+
+  test 'input generates a time select for time attributes' do
+    swap_wrapper do
+      with_input_for @user, :delivery_time, :time
+      assert_select 'input[type=hidden]#user_delivery_time_1i'
+      assert_select 'input[type=hidden]#user_delivery_time_2i'
+      assert_select 'input[type=hidden]#user_delivery_time_3i'
+      assert_select 'select.time#user_delivery_time_4i'
+      assert_select 'select.time#user_delivery_time_5i'
+    end
   end
 
-  test 'input should be able to pass options to time select' do
-    with_input_for @user, :delivery_time, :time, :required => true,
-      :disabled => true, :prompt => { :hour => 'hora', :minute => 'minuto' }
+  test 'input is able to pass options to time select' do
+    with_input_for @user, :delivery_time, :time, required: true, html5: false,
+      disabled: true, prompt: { hour: 'hora', minute: 'minuto' }
 
     assert_select 'select.time[disabled=disabled]'
     assert_select 'select.time option', 'hora'
     assert_select 'select.time option', 'minuto'
   end
 
-  test 'label should use i18n to get target for date input type' do
-    store_translations(:en, :date => { :order => [:month, :day, :year] }) do
-      with_input_for :project, :created_at, :date
+  test 'input generates a time input for time attributes if HTML5 compatibility is explicitly enabled' do
+    swap_wrapper do
+      with_input_for @user, :delivery_time, :time, html5: true
+
+      assert_select 'input[type="time"]'
+    end
+  end
+
+  test 'label uses i18n to get target for date input type' do
+    store_translations(:en, date: { order: %w[month day year] }) do
+      with_input_for :project, :created_at, :date, html5: false
       assert_select 'label[for=project_created_at_2i]'
     end
   end
 
-  test 'label should use i18n to get target for datetime input type' do
-    store_translations(:en, :date => { :order => [:month, :day, :year] }) do
-      with_input_for :project, :created_at, :datetime
+  test 'label uses i18n to get target for datetime input type' do
+    store_translations(:en, date: { order: %w[month day year] }) do
+      with_input_for :project, :created_at, :datetime, html5: false
       assert_select 'label[for=project_created_at_2i]'
     end
   end
 
-  test 'label should use order to get target when date input type' do
-    with_input_for :project, :created_at, :date, :order => [:month, :year, :day]
+  test 'label uses order to get target when date input type' do
+    with_input_for :project, :created_at, :date, order: %w[month year day], html5: false
     assert_select 'label[for=project_created_at_2i]'
   end
 
-  test 'label should use order to get target when datetime input type' do
-    with_input_for :project, :created_at, :datetime, :order => [:month, :year, :day]
+  test 'label uses order to get target when datetime input type' do
+    with_input_for :project, :created_at, :datetime, order: %w[month year day], html5: false
     assert_select 'label[for=project_created_at_2i]'
   end
 
-  test 'label should point to first option when time input type' do
-    with_input_for :project, :created_at, :time
+  test 'label points to first option when time input type' do
+    with_input_for :project, :created_at, :time, html5: false
     assert_select 'label[for=project_created_at_4i]'
   end
 
-  test 'date time input should not generate invalid required html attribute' do
-    with_input_for @user, :delivery_time, :time, :required => true
-    assert_select 'select.required'
-    assert_no_select 'select[required]'
+  test 'label points to attribute name if HTML5 compatibility is explicitly enabled' do
+    with_input_for :project, :created_at, :date, html5: true
+    assert_select 'label[for=project_created_at]'
   end
 end

data/test/inputs/disabled_test.rb

@@ -1,38 +1,79 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 class DisabledTest < ActionView::TestCase
-  test 'input should generate disabled elements based on the disabled option' do
-    with_input_for @user, :name, :string, :disabled => true
+  test 'string input is disabled when disabled option is true' do
+    with_input_for @user, :name, :string, disabled: true
     assert_select 'input.string.disabled[disabled]'
-    with_input_for @user, :description, :text, :disabled => true
+  end
+
+  test 'text input is disabled when disabled option is true' do
+    with_input_for @user, :description, :text, disabled: true
     assert_select 'textarea.text.disabled[disabled]'
-    with_input_for @user, :age, :integer, :disabled => true
+  end
+
+  test 'numeric input is disabled when disabled option is true' do
+    with_input_for @user, :age, :integer, disabled: true
     assert_select 'input.integer.disabled[disabled]'
-    with_input_for @user, :born_at, :date, :disabled => true
+  end
+
+  test 'date input is disabled when disabled option is true' do
+    with_input_for @user, :born_at, :date, disabled: true
     assert_select 'select.date.disabled[disabled]'
-    with_input_for @user, :created_at, :datetime, :disabled => true
+  end
+
+  test 'datetime input is disabled when disabled option is true' do
+    with_input_for @user, :created_at, :datetime, disabled: true
     assert_select 'select.datetime.disabled[disabled]'
+  end
+
+  test 'string input does not be disabled when disabled option is false' do
+    with_input_for @user, :name, :string, disabled: false
+    assert_no_select 'input.string.disabled[disabled]'
+  end
+
+  test 'text input does not be disabled when disabled option is false' do
+    with_input_for @user, :description, :text, disabled: false
+    assert_no_select 'textarea.text.disabled[disabled]'
+  end
 
-    with_input_for @user, :name, :string, :disabled => false
-    assert_select 'input.string:not(.disabled[disabled])'
-    with_input_for @user, :description, :text, :disabled => false
-    assert_select 'textarea.text:not(.disabled[disabled])'
-    with_input_for @user, :age, :integer, :disabled => false
-    assert_select 'input.integer:not(.disabled[disabled])'
-    with_input_for @user, :born_at, :date, :disabled => false
-    assert_select 'select.date:not(.disabled[disabled])'
-    with_input_for @user, :created_at, :datetime, :disabled => false
-    assert_select 'select.datetime:not(.disabled[disabled])'
+  test 'numeric input does not be disabled when disabled option is false' do
+    with_input_for @user, :age, :integer, disabled: false
+    assert_no_select 'input.integer.disabled[disabled]'
+  end
+
+  test 'date input does not be disabled when disabled option is false' do
+    with_input_for @user, :born_at, :date, disabled: false
+    assert_no_select 'select.date.disabled[disabled]'
+  end
 
+  test 'datetime input does not be disabled when disabled option is false' do
+    with_input_for @user, :created_at, :datetime, disabled: false
+    assert_no_select 'select.datetime.disabled[disabled]'
+  end
+
+  test 'string input does not be disabled when disabled option is not present' do
     with_input_for @user, :name, :string
-    assert_select 'input.string:not(.disabled[disabled])'
+    assert_no_select 'input.string.disabled[disabled]'
+  end
+
+  test 'text input does not be disabled when disabled option is not present' do
     with_input_for @user, :description, :text
-    assert_select 'textarea.text:not(.disabled[disabled])'
+    assert_no_select 'textarea.text.disabled[disabled]'
+  end
+
+  test 'numeric input does not be disabled when disabled option is not present' do
     with_input_for @user, :age, :integer
-    assert_select 'input.integer:not(.disabled[disabled])'
+    assert_no_select 'input.integer.disabled[disabled]'
+  end
+
+  test 'date input does not be disabled when disabled option is not present' do
     with_input_for @user, :born_at, :date
-    assert_select 'select.date:not(.disabled[disabled])'
+    assert_no_select 'select.date.disabled[disabled]'
+  end
+
+  test 'datetime input does not be disabled when disabled option is not present' do
     with_input_for @user, :created_at, :datetime
-    assert_select 'select.datetime:not(.disabled[disabled])'
+    assert_no_select 'select.datetime.disabled[disabled]'
   end
 end

data/test/inputs/discovery_test.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 class DiscoveryTest < ActionView::TestCase
   # Setup new inputs and remove them after the test.
-  def discovery(value=false)
-    swap SimpleForm, :cache_discovery => value do
+  def discovery(value = false)
+    swap SimpleForm, cache_discovery: value do
       begin
         load "support/discovery_inputs.rb"
         yield
@@ -12,11 +13,16 @@ class DiscoveryTest < ActionView::TestCase
         Object.send :remove_const, :StringInput
         Object.send :remove_const, :NumericInput
         Object.send :remove_const, :CustomizedInput
+        Object.send :remove_const, :DeprecatedInput
+        Object.send :remove_const, :CollectionSelectInput
+        CustomInputs.send :remove_const, :CustomizedInput
+        CustomInputs.send :remove_const, :PasswordInput
+        CustomInputs.send :remove_const, :NumericInput
       end
     end
   end
 
-  test 'builder should not discover new inputs if cached' do
+  test 'builder does not discover new inputs if cached' do
     with_form_for @user, :name
     assert_select 'form input#user_name.string'
 
@@ -26,18 +32,18 @@ class DiscoveryTest < ActionView::TestCase
     end
   end
 
-  test 'builder should discover new inputs' do
+  test 'builder discovers new inputs' do
     discovery do
-      with_form_for @user, :name, :as => :customized
+      with_form_for @user, :name, as: :customized
       assert_select 'form section input#user_name.string'
     end
   end
 
-  test 'builder should not discover new inputs if discovery is off' do
+  test 'builder does not discover new inputs if discovery is off' do
     with_form_for @user, :name
     assert_select 'form input#user_name.string'
 
-    swap SimpleForm, :inputs_discovery => false do
+    swap SimpleForm, inputs_discovery: false do
       discovery do
         with_form_for @user, :name
         assert_no_select 'form section input#user_name.string'
@@ -45,17 +51,71 @@ class DiscoveryTest < ActionView::TestCase
     end
   end
 
-  test 'builder should discover new inputs from mappings if not cached' do
+  test 'builder discovers new inputs from mappings if not cached' do
     discovery do
       with_form_for @user, :name
       assert_select 'form section input#user_name.string'
     end
   end
 
-  test 'builder should discover new inputs from internal fallbacks if not cached' do
+  test 'builder discovers new inputs from internal fallbacks if not cached' do
     discovery do
       with_form_for @user, :age
       assert_select 'form section input#user_age.numeric.integer'
     end
   end
-end
+
+  test 'builder discovers new maped inputs from configured namespaces if not cached' do
+    discovery do
+      swap SimpleForm, custom_inputs_namespaces: ['CustomInputs'] do
+        with_form_for @user, :password
+        assert_select 'form input#user_password.password-custom-input'
+      end
+    end
+  end
+
+  test 'builder discovers new maped inputs from configured namespaces before the ones from top level namespace' do
+    discovery do
+      swap SimpleForm, custom_inputs_namespaces: ['CustomInputs'] do
+        with_form_for @user, :age
+        assert_select 'form input#user_age.numeric-custom-input'
+      end
+    end
+  end
+
+  test 'builder discovers new custom inputs from configured namespace before the ones from top level namespace' do
+    discovery do
+      swap SimpleForm, custom_inputs_namespaces: ['CustomInputs'] do
+        with_form_for @user, :name, as: 'customized'
+        assert_select 'form input#user_name.customized-namespace-custom-input'
+      end
+    end
+  end
+
+  test 'raises error when configured namespace does not exists' do
+    discovery do
+      swap SimpleForm, custom_inputs_namespaces: ['InvalidNamespace'] do
+        assert_raise NameError do
+          with_form_for @user, :age
+        end
+      end
+    end
+  end
+
+  test 'new inputs can override the input_html_options' do
+    discovery do
+      with_form_for @user, :active, as: :select
+      assert_select 'form select#user_active.select.chosen'
+    end
+  end
+
+  test 'inputs method without wrapper_options are deprecated' do
+    discovery do
+      assert_deprecated do
+        with_form_for @user, :name, as: :deprecated
+      end
+
+      assert_select 'form section input#user_name.string'
+    end
+  end
+end

data/test/inputs/file_input_test.rb

@@ -1,14 +1,15 @@
+# frozen_string_literal: true
 # encoding: UTF-8
 require 'test_helper'
 
 class FileInputTest < ActionView::TestCase
-  test 'input should generate a file field' do
+  test 'input generates a file field' do
     with_input_for @user, :name, :file
     assert_select 'input#user_name[type=file]'
   end
 
-  test "input should generate a file field that doesn't accept placeholder" do
-    store_translations(:en, :simple_form => { :placeholders => { :user => { :name => "text" } } }) do
+  test "input generates a file field that doesn't accept placeholder" do
+    store_translations(:en, simple_form: { placeholders: { user: { name: "text" } } }) do
       with_input_for @user, :name, :file
       assert_no_select 'input[placeholder]'
     end

data/test/inputs/general_test.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
 # encoding: UTF-8
 require 'test_helper'
 
 class InputTest < ActionView::TestCase
-  test 'input should generate css class based on default input type' do
+  test 'input generates css class based on default input type' do
     with_input_for @user, :name, :string
     assert_select 'input.string'
     with_input_for @user, :description, :text
@@ -15,55 +16,118 @@ class InputTest < ActionView::TestCase
     assert_select 'select.datetime'
   end
 
-  test 'input should generate autofocus attribute based on the autofocus option' do
-    with_input_for @user, :name, :string, :autofocus => true
+  test 'string input generates autofocus attribute when autofocus option is true' do
+    with_input_for @user, :name, :string, autofocus: true
     assert_select 'input.string[autofocus]'
-    with_input_for @user, :description, :text, :autofocus => true
+  end
+
+  test 'input accepts input_class configuration' do
+    swap SimpleForm, input_class: :xlarge do
+      with_input_for @user, :name, :string
+      assert_select 'input.xlarge'
+      assert_no_select 'div.xlarge'
+    end
+  end
+
+  test 'input does not add input_class when configured to not generate additional classes for input' do
+    swap SimpleForm, input_class: 'xlarge', generate_additional_classes_for: [:wrapper] do
+      with_input_for @user, :name, :string
+      assert_select 'input'
+      assert_no_select '.xlarge'
+    end
+  end
+
+  test 'text input generates autofocus attribute when autofocus option is true' do
+    with_input_for @user, :description, :text, autofocus: true
     assert_select 'textarea.text[autofocus]'
-    with_input_for @user, :age, :integer, :autofocus => true
+  end
+
+  test 'numeric input generates autofocus attribute when autofocus option is true' do
+    with_input_for @user, :age, :integer, autofocus: true
     assert_select 'input.integer[autofocus]'
-    with_input_for @user, :born_at, :date, :autofocus => true
+  end
+
+  test 'date input generates autofocus attribute when autofocus option is true' do
+    with_input_for @user, :born_at, :date, autofocus: true
     assert_select 'select.date[autofocus]'
-    with_input_for @user, :created_at, :datetime, :autofocus => true
+  end
+
+  test 'datetime input generates autofocus attribute when autofocus option is true' do
+    with_input_for @user, :created_at, :datetime, autofocus: true
     assert_select 'select.datetime[autofocus]'
+  end
+
+  test 'string input generates autofocus attribute when autofocus option is false' do
+    with_input_for @user, :name, :string, autofocus: false
+    assert_no_select 'input.string[autofocus]'
+  end
+
+  test 'text input generates autofocus attribute when autofocus option is false' do
+    with_input_for @user, :description, :text, autofocus: false
+    assert_no_select 'textarea.text[autofocus]'
+  end
+
+  test 'numeric input generates autofocus attribute when autofocus option is false' do
+    with_input_for @user, :age, :integer, autofocus: false
+    assert_no_select 'input.integer[autofocus]'
+  end
+
+  test 'date input generates autofocus attribute when autofocus option is false' do
+    with_input_for @user, :born_at, :date, autofocus: false
+    assert_no_select 'select.date[autofocus]'
+  end
 
-    with_input_for @user, :name, :string, :autofocus => false
-    assert_select 'input.string:not([autofocus])'
-    with_input_for @user, :description, :text, :autofocus => false
-    assert_select 'textarea.text:not([autofocus])'
-    with_input_for @user, :age, :integer, :autofocus => false
-    assert_select 'input.integer:not([autofocus])'
-    with_input_for @user, :born_at, :date, :autofocus => false
-    assert_select 'select.date:not([autofocus])'
-    with_input_for @user, :created_at, :datetime, :autofocus => false
-    assert_select 'select.datetime:not([autofocus])'
+  test 'datetime input generates autofocus attribute when autofocus option is false' do
+    with_input_for @user, :created_at, :datetime, autofocus: false
+    assert_no_select 'select.datetime[autofocus]'
+  end
 
+  test 'string input generates autofocus attribute when autofocus option is not present' do
     with_input_for @user, :name, :string
-    assert_select 'input.string:not([autofocus])'
+    assert_no_select 'input.string[autofocus]'
+  end
+
+  test 'text input generates autofocus attribute when autofocus option is not present' do
     with_input_for @user, :description, :text
-    assert_select 'textarea.text:not([autofocus])'
+    assert_no_select 'textarea.text[autofocus]'
+  end
+
+  test 'numeric input generates autofocus attribute when autofocus option is not present' do
     with_input_for @user, :age, :integer
-    assert_select 'input.integer:not([autofocus])'
+    assert_no_select 'input.integer[autofocus]'
+  end
+
+  test 'date input generates autofocus attribute when autofocus option is not present' do
     with_input_for @user, :born_at, :date
-    assert_select 'select.date:not([autofocus])'
+    assert_no_select 'select.date[autofocus]'
+  end
+
+  test 'datetime input generates autofocus attribute when autofocus option is not present' do
     with_input_for @user, :created_at, :datetime
-    assert_select 'select.datetime:not([autofocus])'
+    assert_no_select 'select.datetime[autofocus]'
   end
 
   # With no object
-  test 'input should be generated properly when object is not present' do
+  test 'input is generated properly when object is not present' do
     with_input_for :project, :name, :string
     assert_select 'input.string.required#project_name'
   end
 
-  test 'input as radio should be generated properly when object is not present ' do
+  test 'input as radio is generated properly when object is not present ' do
     with_input_for :project, :name, :radio_buttons
     assert_select 'input.radio_buttons#project_name_true'
     assert_select 'input.radio_buttons#project_name_false'
   end
 
-  test 'input as select with collection should be generated properly when object is not present' do
-    with_input_for :project, :name, :select, :collection => ['Jose', 'Carlos']
+  test 'input as select with collection is generated properly when object is not present' do
+    with_input_for :project, :name, :select, collection: %w[Jose Carlos]
     assert_select 'select.select#project_name'
   end
+
+  test 'input does not generate empty css class' do
+    swap SimpleForm, generate_additional_classes_for: %i[wrapper label] do
+      with_input_for :project, :name, :string
+      assert_no_select 'input#project_name[class]'
+    end
+  end
 end