simple_form 3.1.0.rc2 → 3.1.1

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
@@ -169,4 +169,9 @@ class DateTimeInputWithoutHtml5Test < ActionView::TestCase
     with_input_for :project, :created_at, :time, html5: false
     assert_select 'label[for=project_created_at_4i]'
   end
+
+  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/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
 

data/test/inputs/priority_input_test.rb

@@ -6,13 +6,13 @@ class PriorityInputTest < ActionView::TestCase
     with_input_for @user, :country, :country
     assert_select 'select#user_country'
     assert_select 'select option[value=Brazil]', 'Brazil'
-    assert_no_select 'select option[value=][disabled=disabled]'
+    assert_no_select 'select option[value=""][disabled=disabled]'
   end
 
   test 'input generates a country select with SimpleForm default' do
     swap SimpleForm, country_priority: [ 'Brazil' ] do
       with_input_for @user, :country, :country
-      assert_select 'select option[value=][disabled=disabled]'
+      assert_select 'select option[value=""][disabled=disabled]'
     end
   end
 
@@ -20,19 +20,19 @@ class PriorityInputTest < ActionView::TestCase
     with_input_for @user, :time_zone, :time_zone
     assert_select 'select#user_time_zone'
     assert_select 'select option[value=Brasilia]', '(GMT-03:00) Brasilia'
-    assert_no_select 'select option[value=][disabled=disabled]'
+    assert_no_select 'select option[value=""][disabled=disabled]'
   end
 
   test 'input generates a time zone select field with default' do
     with_input_for @user, :time_zone, :time_zone, default: 'Brasilia'
     assert_select 'select option[value=Brasilia][selected=selected]'
-    assert_no_select 'select option[value=]'
+    assert_no_select 'select option[value=""]'
   end
 
   test 'input generates a time zone select using options priority' do
     with_input_for @user, :time_zone, :time_zone, priority: /Brasilia/
-    assert_select 'select option[value=][disabled=disabled]'
-    assert_no_select 'select option[value=]', /^$/
+    assert_select 'select option[value=""][disabled=disabled]'
+    assert_no_select 'select option[value=""]', /^$/
   end
 
   test 'priority input does not generate invalid required html attribute' do

data/test/inputs/required_test.rb

@@ -110,4 +110,16 @@ class RequiredTest < ActionView::TestCase
     assert_no_select 'input[required]'
     assert_select 'input.optional#validating_user_phone_number'
   end
+
+  test 'builder input does not generate required html attribute when option is set to false when it is set to true in wrapper' do
+    swap SimpleForm, browser_validations: true do
+      swap_wrapper :default, self.custom_wrapper_with_required_input do
+        with_concat_form_for(@user) do |f|
+          concat f.input :name, required: false
+        end
+        assert_no_select 'input[type=text][required]'
+        assert_no_select 'input[type=text][aria-required]'
+      end
+    end
+  end
 end

data/test/inputs/string_input_test.rb

@@ -4,7 +4,7 @@ require 'test_helper'
 class StringInputTest < ActionView::TestCase
   test 'input maps text field to string attribute' do
     with_input_for @user, :name, :string
-    assert_select "input#user_name[type=text][name='user[name]'][value=New in SimpleForm!]"
+    assert_select "input#user_name[type=text][name='user[name]'][value='New in SimpleForm!']"
   end
 
   test 'input generates a password field for password attributes' do
@@ -14,7 +14,7 @@ class StringInputTest < ActionView::TestCase
 
   test 'input gets maxlength from column definition for string attributes' do
     with_input_for @user, :name, :string
-    assert_select 'input.string[maxlength=100]'
+    assert_select 'input.string[maxlength="100"]'
   end
 
   test 'input does not get maxlength from column without size definition for string attributes' do
@@ -24,12 +24,12 @@ class StringInputTest < ActionView::TestCase
 
   test 'input gets maxlength from column definition for password attributes' do
     with_input_for @user, :password, :password
-    assert_select 'input.password[type=password][maxlength=100]'
+    assert_select 'input.password[type=password][maxlength="100"]'
   end
 
   test 'input infers maxlength column definition from validation when present' do
     with_input_for @validating_user, :name, :string
-    assert_select 'input.string[maxlength=25]'
+    assert_select 'input.string[maxlength="25"]'
   end
 
   test 'input does not get maxlength from validation when tokenizer present' do
@@ -39,13 +39,13 @@ class StringInputTest < ActionView::TestCase
 
   test 'input gets maxlength from validation when :is option present' do
     with_input_for @validating_user, :home_picture, :string
-    assert_select 'input.string[maxlength=12]'
+    assert_select 'input.string[maxlength="12"]'
   end
 
   test 'input maxlength is the column limit plus one to make room for decimal point' do
     with_input_for @user, :credit_limit, :string
 
-    assert_select "input.string[maxlength=16]"
+    assert_select 'input.string[maxlength="16"]'
   end
 
   test 'input does not generate placeholder by default' do
@@ -55,12 +55,12 @@ class StringInputTest < ActionView::TestCase
 
   test 'input accepts the placeholder option' do
     with_input_for @user, :name, :string, placeholder: 'Put in some text'
-    assert_select 'input.string[placeholder=Put in some text]'
+    assert_select 'input.string[placeholder="Put in some text"]'
   end
 
   test 'input generates a password field for password attributes that accept placeholder' do
     with_input_for @user, :password, :password, placeholder: 'Password Confirmation'
-    assert_select 'input[type=password].password[placeholder=Password Confirmation]#user_password'
+    assert_select 'input[type=password].password[placeholder="Password Confirmation"]#user_password'
   end
 
   test 'input does not infer pattern from attributes by default' do
@@ -100,7 +100,7 @@ class StringInputTest < ActionView::TestCase
       name: 'Name goes here'
     } } }) do
       with_input_for @user, :name, :string
-      assert_select 'input.string[placeholder=Name goes here]'
+      assert_select 'input.string[placeholder="Name goes here"]'
     end
   end
 
@@ -110,7 +110,7 @@ class StringInputTest < ActionView::TestCase
     } } }) do
       swap SimpleForm, i18n_scope: :my_scope do
         with_input_for @user, :name, :string
-        assert_select 'input.string[placeholder=Name goes here]'
+        assert_select 'input.string[placeholder="Name goes here"]'
       end
     end
   end

data/test/inputs/text_input_test.rb

@@ -9,16 +9,23 @@ class TextInputTest < ActionView::TestCase
 
   test 'input generates a text area for text attributes that accept placeholder' do
     with_input_for @user, :description, :text, placeholder: 'Put in some text'
-    assert_select 'textarea.text[placeholder=Put in some text]'
+    assert_select 'textarea.text[placeholder="Put in some text"]'
+  end
+
+  test 'input generates a placeholder from the translations' do
+    store_translations(:en, simple_form: { placeholders: { user: { name: "placeholder from i18n en.simple_form.placeholders.user.name" } } }) do
+      with_input_for @user, :name, :text
+      assert_select 'textarea.text[placeholder="placeholder from i18n en.simple_form.placeholders.user.name"]'
+    end
   end
 
   test 'input gets maxlength from column definition for text attributes' do
     with_input_for @user, :description, :text
-    assert_select 'textarea.text[maxlength=200]'
+    assert_select 'textarea.text[maxlength="200"]'
   end
 
   test 'input infers maxlength column definition from validation when present for text attributes' do
     with_input_for @validating_user, :description, :text
-    assert_select 'textarea.text[maxlength=50]'
+    assert_select 'textarea.text[maxlength="50"]'
   end
 end

data/test/support/misc_helpers.rb

@@ -46,7 +46,7 @@ module MiscHelpers
     end
   end
 
-  def swap_wrapper(name = :default, wrapper = self.custom_wrapper)
+  def swap_wrapper(name = :default, wrapper = custom_wrapper)
     old = SimpleForm.wrappers[name.to_s]
     SimpleForm.wrappers[name.to_s] = wrapper
     yield
@@ -178,6 +178,19 @@ module MiscHelpers
     end
   end
 
+  def custom_wrapper_with_html5_components
+    SimpleForm.build tag: :span, class: 'custom_wrapper' do |b|
+      b.use :label_text
+    end
+  end
+
+  def custom_wrapper_with_required_input
+    SimpleForm.build tag: :span, class: 'custom_wrapper' do |b|
+      b.use :html5
+      b.use :input, required: true
+    end
+  end
+
   def custom_form_for(object, *args, &block)
     simple_form_for(object, *args, { builder: CustomFormBuilder }, &block)
   end

data/test/support/models.rb

@@ -130,6 +130,16 @@ class User
     Column.new(attribute, column_type, limit)
   end
 
+  def has_attribute?(attribute)
+    case attribute.to_sym
+      when :name, :status, :password, :description, :age,
+        :credit_limit, :active, :born_at, :delivery_time,
+        :created_at, :updated_at, :lock_version, :home_picture,
+        :amount, :attempts, :action, :credit_card, :uuid then true
+      else false
+    end
+  end
+
   def self.human_attribute_name(attribute, options = {})
     case attribute
       when 'name'
@@ -165,7 +175,7 @@ class User
   def errors
     @errors ||= begin
       errors = ActiveModel::Errors.new(self)
-      errors.add(:name, "can't be blank")
+      errors.add(:name, "cannot be blank")
       errors.add(:description, 'must be longer than 15 characters')
       errors.add(:age, 'is not a number')
       errors.add(:age, 'must be greater than 18')

data/test/test_helper.rb

@@ -30,7 +30,15 @@ I18n.default_locale = :en
 
 require 'country_select'
 
-ActionDispatch::Assertions::NO_STRIP << "label"
+if defined?(HTMLSelector::NO_STRIP)
+  HTMLSelector::NO_STRIP << "label"
+else
+  ActionDispatch::Assertions::NO_STRIP << "label"
+end
+
+if ActiveSupport::TestCase.respond_to?(:test_order=)
+  ActiveSupport::TestCase.test_order = :random
+end
 
 class ActionView::TestCase
   include MiscHelpers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_form
 version: !ruby/object:Gem::Version
-  version: 3.1.0.rc2
+  version: 3.1.1
 platform: ruby
 authors:
 - José Valim
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2015-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -161,12 +161,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: simple_form
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Forms made easy!