simple_form 3.1.0.rc2 → 3.1.0

data/test/form_builder/hint_test.rb

@@ -50,7 +50,7 @@ class HintTest < ActionView::TestCase
 
   test 'builder escapes hint text' do
     with_hint_for @user, :name, hint: '<script>alert(1337)</script>'
-    assert_select 'span.hint', "&lt;script&gt;alert(1337)&lt;/script&gt;"
+    assert_no_select 'span.hint script'
   end
 
   # Without attribute name
@@ -137,8 +137,8 @@ class HintTest < ActionView::TestCase
 
   test 'hint with custom wrappers works' do
     swap_wrapper do
-      with_hint_for @user, :name, hint: "can't be blank"
-      assert_select 'div.omg_hint', "can&#39;t be blank"
+      with_hint_for @user, :name, hint: "cannot be blank"
+      assert_select 'div.omg_hint', "cannot be blank"
     end
   end
 end

data/test/form_builder/input_field_test.rb

@@ -76,7 +76,7 @@ class InputFieldTest < ActionView::TestCase
         f.input_field :name
       end
 
-      assert_select 'input.string[placeholder=Name goes here]'
+      assert_select 'input.string[placeholder="Name goes here"]'
     end
   end
 
@@ -85,7 +85,7 @@ class InputFieldTest < ActionView::TestCase
       f.input_field :age, as: :integer
     end
 
-    assert_select 'input[min=18]'
+    assert_select 'input[min="18"]'
   end
 
   test 'builder input_field does not use pattern component by default' do
@@ -125,7 +125,7 @@ class InputFieldTest < ActionView::TestCase
       f.input_field :name, as: :string
     end
 
-    assert_select 'input.string[maxlength=25]'
+    assert_select 'input.string[maxlength="25"]'
   end
 
   test 'builder collection input_field generates input tag with a clean HTML' do
@@ -146,4 +146,44 @@ class InputFieldTest < ActionView::TestCase
 
     assert_no_select 'input.boolean[boolean_style]'
   end
+
+  test 'build input_field without pattern component use the pattern string' do
+    swap_wrapper :default, self.custom_wrapper_with_html5_components do
+      with_concat_form_for(@user) do |f|
+        f.input_field :name, pattern: '\w+'
+      end
+
+      assert_select 'input[pattern="\w+"]'
+    end
+  end
+
+  test 'build input_field without placeholder component use the placeholder string' do
+    swap_wrapper :default, self.custom_wrapper_with_html5_components do
+      with_concat_form_for(@user) do |f|
+        f.input_field :name, placeholder: 'Placeholder'
+      end
+
+      assert_select 'input[placeholder="Placeholder"]'
+    end
+  end
+
+  test 'build input_field without maxlength component use the maxlength string' do
+    swap_wrapper :default, self.custom_wrapper_with_html5_components do
+      with_concat_form_for(@user) do |f|
+        f.input_field :name, maxlength: 5
+      end
+
+      assert_select 'input[maxlength="5"]'
+    end
+  end
+
+  test 'build input_field without readonly component use the readonly string' do
+    swap_wrapper :default, self.custom_wrapper_with_html5_components do
+      with_concat_form_for(@user) do |f|
+        f.input_field :name, readonly: true
+      end
+
+      assert_select 'input[readonly="readonly"]'
+    end
+  end
 end

data/test/form_builder/label_test.rb

@@ -31,7 +31,7 @@ class LabelTest < ActionView::TestCase
 
   test 'builder escapes label text' do
     with_label_for @user, :name, label: '<script>alert(1337)</script>', required: false
-    assert_select 'label.string', "&lt;script&gt;alert(1337)&lt;/script&gt;"
+    assert_no_select 'label.string script'
   end
 
   test 'builder does not escape label text if it is safe' do

data/test/form_builder/wrapper_test.rb

@@ -139,7 +139,7 @@ class WrapperTest < ActionView::TestCase
   test 'custom wrappers can have full error message on attributes' do
     swap_wrapper :default, self.custom_wrapper_with_full_error do
       with_form_for @user, :name
-      assert_select 'span.error', "Name can't be blank"
+      assert_select 'span.error', "Name cannot be blank"
     end
   end
 
@@ -227,6 +227,21 @@ class WrapperTest < ActionView::TestCase
     assert_select "section.custom_wrapper div.another_wrapper input.string"
   end
 
+  test 'simple_fields_form reuses custom wrapper mapping per form basis' do
+    @user.company = Company.new(1, 'Empresa')
+
+    swap_wrapper :another do
+      with_concat_form_for @user, wrapper_mappings: { string: :another } do |f|
+        concat(f.simple_fields_for(:company) do |company_form|
+          concat(company_form.input(:name))
+        end)
+      end
+    end
+
+    assert_select "section.custom_wrapper div.another_wrapper label"
+    assert_select "section.custom_wrapper div.another_wrapper input.string"
+  end
+
   test 'input accepts attributes in the DSL' do
     swap_wrapper :default, self.custom_wrapper_with_input_class do
       with_concat_form_for @user do |f|
@@ -270,8 +285,8 @@ class WrapperTest < ActionView::TestCase
 
   test 'inline wrapper displays when there is content' do
     swap_wrapper :default, self.custom_wrapper_with_wrapped_optional_component do
-      with_form_for @user, :name, hint: "can't be blank"
-      assert_select 'section.custom_wrapper div.no_output_wrapper p.omg_hint', "can&#39;t be blank"
+      with_form_for @user, :name, hint: "cannot be blank"
+      assert_select 'section.custom_wrapper div.no_output_wrapper p.omg_hint', "cannot be blank"
       assert_select 'p.omg_hint'
     end
   end

data/test/generators/simple_form_generator_test.rb

@@ -29,8 +29,8 @@ class SimpleFormGeneratorTest < Rails::Generators::TestCase
     run_generator %w(--foundation)
     assert_file 'config/initializers/simple_form.rb',
       /config\.default_wrapper = :default/, /config\.boolean_style = :nested/
-    assert_file 'config/initializers/simple_form_foundation.rb', /config\.wrappers :foundation/,
-      /config\.default_wrapper = :foundation/
+    assert_file 'config/initializers/simple_form_foundation.rb', /config\.wrappers :vertical_form/,
+      /config\.default_wrapper = :vertical_form/, /config\.item_wrapper_tag = :div/
   end
 
   %W(erb haml slim).each do |engine|

data/test/inputs/boolean_input_test.rb

@@ -57,7 +57,7 @@ class BooleanInputTest < ActionView::TestCase
   test 'input boolean with nested escapes :inline_label with HTML' do
     swap SimpleForm, boolean_style: :nested do
       with_input_for @user, :active, :boolean, inline_label: '<b>I am so inline.</b>'
-      assert_select 'label.checkbox', text: ' &lt;b&gt;I am so inline.&lt;/b&gt;'
+      assert_no_select 'label.checkbox b'
     end
   end
 
@@ -197,4 +197,12 @@ class BooleanInputTest < ActionView::TestCase
       end
     end
   end
+
+  test 'input boolean works with wrapper config defining a class for the input' do
+    swap_wrapper :default, self.custom_wrapper_with_input_class do
+      with_input_for @user, :active, :boolean
+
+      assert_select 'input.boolean.inline-class'
+    end
+  end
 end

data/test/inputs/collection_check_boxes_input_test.rb

@@ -278,4 +278,26 @@ class CollectionCheckBoxesInputTest < ActionView::TestCase
       assert_select 'span.custom'
     end
   end
+
+  test 'input check boxes with nested style and namespace uses the right for attribute' do
+    swap SimpleForm, include_default_input_wrapper_class: false, boolean_style: :nested do
+      with_concat_form_for @user, namespace: :foo do |f|
+        concat f.input :gender, as: :check_boxes, collection: [:male, :female]
+      end
+
+      assert_select 'label[for=foo_user_gender_male]'
+      assert_select 'label[for=foo_user_gender_female]'
+    end
+  end
+
+  test 'input check boxes with nested style and index uses the right for attribute' do
+    swap SimpleForm, include_default_input_wrapper_class: false, boolean_style: :nested do
+      with_concat_form_for @user, index: 1 do |f|
+        concat f.input :gender, as: :check_boxes, collection: [:male, :female]
+      end
+
+      assert_select 'label[for=user_1_gender_male]'
+      assert_select 'label[for=user_1_gender_female]'
+    end
+  end
 end

data/test/inputs/collection_radio_buttons_input_test.rb

@@ -100,8 +100,8 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
         with_input_for @user, :gender, :radio_buttons, collection: [:male, :female]
         assert_select 'input[type=radio][value=male]'
         assert_select 'input[type=radio][value=female]'
-        assert_select 'label[for=user_gender_male]', 'Male'
-        assert_select 'label[for=user_gender_female]', 'Female'
+        assert_select 'label[for=user_gender_male] strong', 'Male'
+        assert_select 'label[for=user_gender_female] strong', 'Female'
       end
     end
   end
@@ -393,7 +393,7 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
     end
   end
 
-  test 'input check boxes custom wrapper class is included when include input wrapper class is falsey' do
+  test 'input radio custom wrapper class is included when include input wrapper class is falsey' do
     swap SimpleForm, include_default_input_wrapper_class: false, boolean_style: :nested do
       with_input_for @user, :gender, :radio_buttons, collection: [:male, :female], item_wrapper_class: 'custom'
 
@@ -401,4 +401,26 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
       assert_select 'span.custom'
     end
   end
+
+  test 'input radio with nested style and namespace uses the right for attribute' do
+    swap SimpleForm, include_default_input_wrapper_class: false, boolean_style: :nested do
+      with_concat_form_for @user, namespace: :foo do |f|
+        concat f.input :gender, as: :radio_buttons, collection: [:male, :female]
+      end
+
+      assert_select 'label[for=foo_user_gender_male]'
+      assert_select 'label[for=foo_user_gender_female]'
+    end
+  end
+
+  test 'input radio with nested style and index uses the right for attribute' do
+    swap SimpleForm, include_default_input_wrapper_class: false, boolean_style: :nested do
+      with_concat_form_for @user, index: 1 do |f|
+        concat f.input :gender, as: :radio_buttons, collection: [:male, :female]
+      end
+
+      assert_select 'label[for=user_1_gender_male]'
+      assert_select 'label[for=user_1_gender_female]'
+    end
+  end
 end

data/test/inputs/collection_select_input_test.rb

@@ -99,7 +99,7 @@ class CollectionSelectInputTest < ActionView::TestCase
 
   test 'input automatically sets include blank' do
     with_input_for @user, :age, :select, collection: 18..30
-    assert_select 'select option[value=]', ''
+    assert_select 'select option[value=""]', ''
   end
 
   test 'input translates include blank when set to :translate' do
@@ -107,7 +107,7 @@ class CollectionSelectInputTest < ActionView::TestCase
       age: 'Rather not say'
     } } }) do
       with_input_for @user, :age, :select, collection: 18..30, include_blank: :translate
-      assert_select 'select option[value=]', 'Rather not say'
+      assert_select 'select option[value=""]', 'Rather not say'
     end
   end
 
@@ -116,7 +116,7 @@ class CollectionSelectInputTest < ActionView::TestCase
       age: 'Rather not say',
     } } }) do
       with_input_for @user, :age, :select, collection: 18..30, include_blank: :translate
-      assert_select 'select option[value=]', 'Rather not say'
+      assert_select 'select option[value=""]', 'Rather not say'
     end
   end
 
@@ -125,7 +125,7 @@ class CollectionSelectInputTest < ActionView::TestCase
       age: 'Rather not say'
     } } }) do
       with_input_for @user, :age, :select, collection: 18..30, include_blank: 'Young at heart'
-      assert_select 'select option[value=]', 'Young at heart'
+      assert_select 'select option[value=""]', 'Young at heart'
     end
   end
 
@@ -134,7 +134,7 @@ class CollectionSelectInputTest < ActionView::TestCase
       age: 'Rather not say'
     } } }) do
       with_input_for @user, :age, :select, collection: 18..30
-      assert_select 'select option[value=]', ''
+      assert_select 'select option[value=""]', ''
     end
   end
 
@@ -143,7 +143,7 @@ class CollectionSelectInputTest < ActionView::TestCase
       age: 'Rather not say'
     } } }) do
       with_input_for @user, :age, :select, collection: 18..30, include_blank: true
-      assert_select 'select option[value=]', ''
+      assert_select 'select option[value=""]', ''
     end
   end
 
@@ -152,23 +152,23 @@ class CollectionSelectInputTest < ActionView::TestCase
       age: 'Rather not say'
     } } }) do
       with_input_for @user, :age, :select, collection: 18..30, include_blank: false
-      assert_no_select 'select option[value=]'
+      assert_no_select 'select option[value=""]'
     end
   end
 
   test 'input does not set include blank if otherwise is told' do
     with_input_for @user, :age, :select, collection: 18..30, include_blank: false
-    assert_no_select 'select option[value=]'
+    assert_no_select 'select option[value=""]'
   end
 
   test 'input does not set include blank if prompt is given' do
     with_input_for @user, :age, :select, collection: 18..30, prompt: "Please select foo"
-    assert_no_select 'select option[value=]', ''
+    assert_no_select 'select option[value=""]', ''
   end
 
   test 'input does not set include blank if multiple is given' do
     with_input_for @user, :age, :select, collection: 18..30, input_html: { multiple: true }
-    assert_no_select 'select option[value=]', ''
+    assert_no_select 'select option[value=""]', ''
   end
 
   test 'input translates prompt when set to :translate' do
@@ -176,7 +176,7 @@ class CollectionSelectInputTest < ActionView::TestCase
       age: 'Select age:'
     } } }) do
       with_input_for @user, :age, :select, collection: 18..30, prompt: :translate
-      assert_select 'select option[value=]', 'Select age:'
+      assert_select 'select option[value=""]', 'Select age:'
     end
   end
 
@@ -185,7 +185,7 @@ class CollectionSelectInputTest < ActionView::TestCase
       age: 'Select age:',
     } } }) do
       with_input_for @user, :age, :select, collection: 18..30, prompt: :translate
-      assert_select 'select option[value=]', 'Select age:'
+      assert_select 'select option[value=""]', 'Select age:'
     end
   end
 
@@ -194,7 +194,7 @@ class CollectionSelectInputTest < ActionView::TestCase
       age: 'Select age:'
     } } }) do
       with_input_for @user, :age, :select, collection: 18..30, prompt: 'Do it:'
-      assert_select 'select option[value=]', 'Do it:'
+      assert_select 'select option[value=""]', 'Do it:'
     end
   end
 
@@ -203,7 +203,7 @@ class CollectionSelectInputTest < ActionView::TestCase
       age: 'Select age:'
     } } }) do
       with_input_for @user, :age, :select, collection: 18..30, prompt: false
-      assert_no_select 'select option[value=]'
+      assert_no_select 'select option[value=""]'
     end
   end
 
@@ -212,15 +212,15 @@ class CollectionSelectInputTest < ActionView::TestCase
       prompt: 'Select value:'
     } }) do
       with_input_for @user, :age, :select, collection: 18..30, prompt: :translate
-      assert_select 'select option[value=]', "Select value:"
+      assert_select 'select option[value=""]', "Select value:"
     end
   end
 
   test 'input detects label and value on collections' do
     users = [User.build(id: 1, name: "Jose"), User.build(id: 2, name: "Carlos")]
     with_input_for @user, :description, :select, collection: users
-    assert_select 'select option[value=1]', 'Jose'
-    assert_select 'select option[value=2]', 'Carlos'
+    assert_select 'select option[value="1"]', 'Jose'
+    assert_select 'select option[value="2"]', 'Carlos'
   end
 
   test 'input disables the anothers components when the option is a object' do

data/test/inputs/datetime_input_test.rb

@@ -102,7 +102,7 @@ class DateTimeInputWithoutHtml5Test < ActionView::TestCase
 
   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]"
+    assert_select "select.date option[value='#{Date.today.year}'][selected=selected]"
   end
 
   test 'input generates a date input for date attributes if HTML5 compatibility is explicitly enabled' do

data/test/inputs/grouped_collection_select_input_test.rb

@@ -109,8 +109,8 @@ class GroupedCollectionSelectInputTest < ActionView::TestCase
 
     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'
+        assert_select 'option[value="7"]', 'Bond'
+        assert_select 'option[value="47"]', 'Hitman'
       end
     end
   end
@@ -155,14 +155,14 @@ 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

data/test/inputs/numeric_input_test.rb

@@ -32,7 +32,7 @@ class NumericInputTest < ActionView::TestCase
     assert_no_select 'input[min]'
 
     with_input_for @other_validating_user, :age, :integer
-    assert_select 'input[min=18]'
+    assert_select 'input[min="18"]'
   end
 
   test 'input infers min value from integer attributes with greater than validation using symbol' do
@@ -40,15 +40,15 @@ class NumericInputTest < ActionView::TestCase
     assert_no_select 'input[min]'
 
     with_input_for @validating_user, :amount, :integer
-    assert_select 'input[min=11]'
+    assert_select 'input[min="11"]'
   end
 
   test 'input infers min value from integer attributes with greater than or equal to validation using symbol' do
     with_input_for @validating_user, :attempts, :float
-    assert_select 'input[min=1]'
+    assert_select 'input[min="1"]'
 
     with_input_for @validating_user, :attempts, :integer
-    assert_select 'input[min=1]'
+    assert_select 'input[min="1"]'
   end
 
   test 'input infers min value from integer attributes with greater than validation using proc' do
@@ -56,15 +56,15 @@ class NumericInputTest < ActionView::TestCase
     assert_no_select 'input[min]'
 
     with_input_for @other_validating_user, :amount, :integer
-    assert_select 'input[min=20]'
+    assert_select 'input[min="20"]'
   end
 
   test 'input infers min value from integer attributes with greater than or equal to validation using proc' do
     with_input_for @other_validating_user, :attempts, :float
-    assert_select 'input[min=19]'
+    assert_select 'input[min="19"]'
 
     with_input_for @other_validating_user, :attempts, :integer
-    assert_select 'input[min=19]'
+    assert_select 'input[min="19"]'
   end
 
   test 'input infers max value from attributes with less than validation' do
@@ -72,7 +72,7 @@ class NumericInputTest < ActionView::TestCase
     assert_no_select 'input[max]'
 
     with_input_for @other_validating_user, :age, :integer
-    assert_select 'input[max=99]'
+    assert_select 'input[max="99"]'
   end
 
   test 'input infers max value from attributes with less than validation using symbol' do
@@ -80,15 +80,15 @@ class NumericInputTest < ActionView::TestCase
     assert_no_select 'input[max]'
 
     with_input_for @validating_user, :amount, :integer
-    assert_select 'input[max=99]'
+    assert_select 'input[max="99"]'
   end
 
   test 'input infers max value from attributes with less than or equal to validation using symbol' do
     with_input_for @validating_user, :attempts, :float
-    assert_select 'input[max=100]'
+    assert_select 'input[max="100"]'
 
     with_input_for @validating_user, :attempts, :integer
-    assert_select 'input[max=100]'
+    assert_select 'input[max="100"]'
   end
 
   test 'input infers max value from attributes with less than validation using proc' do
@@ -96,15 +96,15 @@ class NumericInputTest < ActionView::TestCase
     assert_no_select 'input[max]'
 
     with_input_for @other_validating_user, :amount, :integer
-    assert_select 'input[max=118]'
+    assert_select 'input[max="118"]'
   end
 
   test 'input infers max value from attributes with less than or equal to validation using proc' do
     with_input_for @other_validating_user, :attempts, :float
-    assert_select 'input[max=119]'
+    assert_select 'input[max="119"]'
 
     with_input_for @other_validating_user, :attempts, :integer
-    assert_select 'input[max=119]'
+    assert_select 'input[max="119"]'
   end
 
   test 'input has step value of any except for integer attribute' do
@@ -112,7 +112,7 @@ class NumericInputTest < ActionView::TestCase
     assert_select 'input[step="any"]'
 
     with_input_for @validating_user, :age, :integer
-    assert_select 'input[step=1]'
+    assert_select 'input[step="1"]'
   end
 
   test 'numeric input does not generate placeholder by default' do
@@ -122,7 +122,7 @@ class NumericInputTest < ActionView::TestCase
 
   test 'numeric input accepts the placeholder option' do
     with_input_for @user, :age, :integer, placeholder: 'Put in your age'
-    assert_select 'input.integer[placeholder=Put in your age]'
+    assert_select 'input.integer[placeholder="Put in your age"]'
   end
 
   test 'numeric input uses i18n to translate placeholder text' do
@@ -130,7 +130,7 @@ class NumericInputTest < ActionView::TestCase
       age: 'Age goes here'
     } } }) do
       with_input_for @user, :age, :integer
-      assert_select 'input.integer[placeholder=Age goes here]'
+      assert_select 'input.integer[placeholder="Age goes here"]'
     end
   end
 
@@ -156,12 +156,12 @@ class NumericInputTest < ActionView::TestCase
   [:integer, :float, :decimal].each do |type|
     test "#{type} input infers min value from attributes with greater than or equal validation" do
       with_input_for @validating_user, :age, type
-      assert_select 'input[min=18]'
+      assert_select 'input[min="18"]'
     end
 
     test "#{type} input infers the max value from attributes with less than or equal to validation" do
       with_input_for @validating_user, :age, type
-      assert_select 'input[max=99]'
+      assert_select 'input[max="99"]'
     end
   end