simple_form 3.0.0 → 3.1.0

data/test/inputs/disabled_test.rb

@@ -1,77 +1,77 @@
 require 'test_helper'
 
 class DisabledTest < ActionView::TestCase
-  test 'string input should be disabled when disabled option is true' do
+  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]'
   end
 
-  test 'text input should be disabled when disabled option is true' do
+  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]'
   end
 
-  test 'numeric input should be disabled when disabled option is true' do
+  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]'
   end
 
-  test 'date input should be disabled when disabled option is true' do
+  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]'
   end
 
-  test 'datetime input should be disabled when disabled option is true' do
+  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 should not be disabled when disabled option is false' do
+  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 should not be disabled when disabled option is false' do
+  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
 
-  test 'numeric input should not be disabled when disabled option is false' do
+  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 should not be disabled when disabled option is false' do
+  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 should not be disabled when disabled option is false' do
+  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 should not be disabled when disabled option is not present' do
+  test 'string input does not be disabled when disabled option is not present' do
     with_input_for @user, :name, :string
     assert_no_select 'input.string.disabled[disabled]'
   end
 
-  test 'text input should not be disabled when disabled option is not present' do
+  test 'text input does not be disabled when disabled option is not present' do
     with_input_for @user, :description, :text
     assert_no_select 'textarea.text.disabled[disabled]'
   end
 
-  test 'numeric input should not be disabled when disabled option is not present' do
+  test 'numeric input does not be disabled when disabled option is not present' do
     with_input_for @user, :age, :integer
     assert_no_select 'input.integer.disabled[disabled]'
   end
 
-  test 'date input should not be disabled when disabled option is not present' do
+  test 'date input does not be disabled when disabled option is not present' do
     with_input_for @user, :born_at, :date
     assert_no_select 'select.date.disabled[disabled]'
   end
 
-  test 'datetime input should not be disabled when disabled option is not present' do
+  test 'datetime input does not be disabled when disabled option is not present' do
     with_input_for @user, :created_at, :datetime
     assert_no_select 'select.datetime.disabled[disabled]'
   end

data/test/inputs/discovery_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class DiscoveryTest < ActionView::TestCase
   # Setup new inputs and remove them after the test.
-  def discovery(value=false)
+  def discovery(value = false)
     swap SimpleForm, cache_discovery: value do
       begin
         load "support/discovery_inputs.rb"
@@ -12,12 +12,15 @@ 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, :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'
 
@@ -27,14 +30,14 @@ 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
       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'
 
@@ -46,24 +49,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
 
+  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

@@ -2,12 +2,12 @@
 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
+  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]'

data/test/inputs/general_test.rb

@@ -2,7 +2,7 @@
 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,7 +15,7 @@ class InputTest < ActionView::TestCase
     assert_select 'select.datetime'
   end
 
-  test 'string input should generate autofocus attribute when autofocus option is true' do
+  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]'
   end
@@ -36,94 +36,94 @@ class InputTest < ActionView::TestCase
     end
   end
 
-  test 'text input should generate autofocus attribute when autofocus option is true' do
+  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]'
   end
 
-  test 'numeric input should generate autofocus attribute when autofocus option is true' do
+  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]'
   end
 
-  test 'date input should generate autofocus attribute when autofocus option is true' do
+  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]'
   end
 
-  test 'datetime input should generate autofocus attribute when autofocus option is true' do
+  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 should generate autofocus attribute when autofocus option is false' do
+  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 should generate autofocus attribute when autofocus option is false' do
+  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 should generate autofocus attribute when autofocus option is false' do
+  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 should generate autofocus attribute when autofocus option is false' do
+  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
 
-  test 'datetime input should generate autofocus attribute when autofocus option is false' do
+  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 should generate autofocus attribute when autofocus option is not present' do
+  test 'string input generates autofocus attribute when autofocus option is not present' do
     with_input_for @user, :name, :string
     assert_no_select 'input.string[autofocus]'
   end
 
-  test 'text input should generate autofocus attribute when autofocus option is not present' do
+  test 'text input generates autofocus attribute when autofocus option is not present' do
     with_input_for @user, :description, :text
     assert_no_select 'textarea.text[autofocus]'
   end
 
-  test 'numeric input should generate autofocus attribute when autofocus option is not present' do
+  test 'numeric input generates autofocus attribute when autofocus option is not present' do
     with_input_for @user, :age, :integer
     assert_no_select 'input.integer[autofocus]'
   end
 
-  test 'date input should generate autofocus attribute when autofocus option is not present' do
+  test 'date input generates autofocus attribute when autofocus option is not present' do
     with_input_for @user, :born_at, :date
     assert_no_select 'select.date[autofocus]'
   end
 
-  test 'datetime input should generate autofocus attribute when autofocus option is not present' do
+  test 'datetime input generates autofocus attribute when autofocus option is not present' do
     with_input_for @user, :created_at, :datetime
     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
+  test 'input as select with collection is generated properly when object is not present' do
     with_input_for :project, :name, :select, collection: ['Jose', 'Carlos']
     assert_select 'select.select#project_name'
   end
 
-  test 'input should not generate empty css class' do
+  test 'input does not generate empty css class' do
     swap SimpleForm, generate_additional_classes_for: [:wrapper, :label] do
       with_input_for :project, :name, :string
       assert_no_select 'input#project_name[class]'

data/test/inputs/grouped_collection_select_input_test.rb

@@ -79,6 +79,42 @@ class GroupedCollectionSelectInputTest < ActionView::TestCase
     end
   end
 
+  test 'grouped collection finds default label methods on the group objects' do
+    option_list = ['Jose', 'Carlos']
+
+    GroupedClass = Struct.new(:to_label, :options)
+    group = GroupedClass.new("Authors", option_list)
+
+    with_input_for @user, :tag_ids, :grouped_select,
+      collection: [group],
+      group_method: :options
+
+    assert_select 'select.grouped_select#user_tag_ids' do
+      assert_select 'optgroup[label=Authors]' do
+        assert_select 'option', 'Jose'
+        assert_select 'option', 'Carlos'
+      end
+    end
+  end
+
+  test 'grouped collections finds the default label method from the first non-empty object' do
+    Agent = Struct.new(:id, :name)
+    agents = [["First", []], ["Second", [Agent.new(7, 'Bond'), Agent.new(47, 'Hitman')]]]
+
+    with_input_for @user, :tag_ids, :grouped_select,
+      collection: agents,
+      group_label_method: :first,
+      group_method: :last,
+      include_blank: false
+
+    assert_select 'select.grouped_select#user_tag_ids' do
+      assert_select 'optgroup[label=Second]' do
+        assert_select 'option[value="7"]', 'Bond'
+        assert_select 'option[value="47"]', 'Hitman'
+      end
+    end
+  end
+
   test 'grouped collection accepts label and value methods options' do
     with_input_for @user, :tag_ids, :grouped_select,
       collection: { 'Authors' => ['Jose', 'Carlos'] },
@@ -94,7 +130,7 @@ class GroupedCollectionSelectInputTest < ActionView::TestCase
     end
   end
 
-  test 'grouped collection should allow overriding label and value methods using a lambda' do
+  test 'grouped collection allows overriding label and value methods using a lambda' do
     with_input_for @user, :tag_ids, :grouped_select,
       collection: { 'Authors' => ['Jose', 'Carlos'] },
       group_method: :last,
@@ -119,19 +155,19 @@ class GroupedCollectionSelectInputTest < ActionView::TestCase
       collection: tag_groups, group_method: :tags
 
     assert_select 'select.grouped_select#user_tag_ids' do
-      assert_select 'optgroup[label=Group of Tags]' do
-        assert_select 'option[value=1]', 'Tag 1'
-        assert_select 'option[value=2]', 'Tag 2'
+      assert_select 'optgroup[label="Group of Tags"]' do
+        assert_select 'option[value="1"]', 'Tag 1'
+        assert_select 'option[value="2"]', 'Tag 2'
       end
 
-      assert_select 'optgroup[label=Other group]' do
-        assert_select 'option[value=3]', 'Tag 3'
-        assert_select 'option[value=4]', 'Tag 4'
+      assert_select 'optgroup[label="Other group"]' do
+        assert_select 'option[value="3"]', 'Tag 3'
+        assert_select 'option[value="4"]', 'Tag 4'
       end
     end
   end
 
-  test 'grouped collection should accept html options as the last element of collection' do
+  test 'grouped collection accepts html options as the last element of collection' do
     with_input_for @user, :tag_ids, :grouped_select,
       collection: [['Authors', [['Jose', 'jose', class: 'foo'], ['Carlos', 'carlos', class: 'bar']]]],
       group_method: :last

data/test/inputs/hidden_input_test.rb

@@ -2,25 +2,25 @@
 require 'test_helper'
 
 class HiddenInputTest < ActionView::TestCase
-  test 'input should generate a hidden field' do
+  test 'input generates a hidden field' do
     with_input_for @user, :name, :hidden
     assert_no_select 'input[type=text]'
     assert_select 'input#user_name[type=hidden]'
   end
 
-  test 'hint should not be generated for hidden fields' do
+  test 'hint does not be generated for hidden fields' do
     store_translations(:en, simple_form: { hints: { user: { name: "text" } } }) do
       with_input_for @user, :name, :hidden
       assert_no_select 'span.hint'
     end
   end
 
-  test 'label should not be generated for hidden inputs' do
+  test 'label does not be generated for hidden inputs' do
     with_input_for @user, :name, :hidden
     assert_no_select 'label'
   end
 
-  test 'required/aria-required/optional options should not be generated for hidden inputs' do
+  test 'required/aria-required/optional options does not be generated for hidden inputs' do
     with_input_for @user, :name, :hidden
     assert_no_select 'input.required'
     assert_no_select 'input[required]'