simple_form 3.1.0.rc2 → 3.1.0

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/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,16 @@ 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 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

@@ -178,6 +178,12 @@ 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_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,11 @@ 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
 
 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.0
 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: 2014-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -161,9 +161,9 @@ 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