bootstrap_form 2.5.2 → 2.5.3

data/test/special_form_class_models_test.rb

@@ -15,7 +15,7 @@ class SpecialFormClassModelsTest < ActionView::TestCase
     I18n.backend.store_translations(:en, {activerecord: {help: {user: {password: "A good password should be at least six characters long"}}}})
 
     expected = %{<div class="form-group"><label class="control-label" for="user_misc">Misc</label><input class="form-control" id="user_misc" name="user[misc]" type="date" /></div>}
-    assert_equal expected, @builder.date_field(:misc)
+    assert_equivalent_xml expected, @builder.date_field(:misc)
   end
 
   test "Nil models are supported for form builder" do
@@ -25,7 +25,7 @@ class SpecialFormClassModelsTest < ActionView::TestCase
     I18n.backend.store_translations(:en, {activerecord: {help: {user: {password: "A good password should be at least six characters long"}}}})
 
     expected = %{<div class="form-group"><label class="control-label" for="user_misc">Misc</label><input class="form-control" id="user_misc" name="user[misc]" type="date" /></div>}
-    assert_equal expected, @builder.date_field(:misc)
+    assert_equivalent_xml expected, @builder.date_field(:misc)
   end
 
   test "Objects without model names are supported for form builder" do
@@ -37,7 +37,7 @@ class SpecialFormClassModelsTest < ActionView::TestCase
     I18n.backend.store_translations(:en, {activerecord: {help: {faux_user: {password: "A good password should be at least six characters long"}}}})
 
     expected = %{<div class="form-group"><label class="control-label" for="user_misc">Misc</label><input class="form-control" id="user_misc" name="user[misc]" type="date" /></div>}
-    assert_equal expected, @builder.date_field(:misc)
+    assert_equivalent_xml expected, @builder.date_field(:misc)
   end
 
 end

data/test/test_helper.rb

@@ -1,4 +1,7 @@
 require 'timecop'
+require 'diffy'
+require 'nokogiri'
+require 'equivalent-xml'
 require 'mocha/mini_test'
 
 # Configure Rails Environment
@@ -16,5 +19,68 @@ def setup_test_fixture
   @user = User.new(email: 'steve@example.com', password: 'secret', comments: 'my comment')
   @builder = BootstrapForm::FormBuilder.new(:user, @user, self, {})
   @horizontal_builder = BootstrapForm::FormBuilder.new(:user, @user, self, { layout: :horizontal, label_col: "col-sm-2", control_col: "col-sm-10" })
-  I18n.backend.store_translations(:en, {activerecord: {help: {user: {password: "A good password should be at least six characters long"}}}})
+  I18n.backend.store_translations(:en, {
+    activerecord: {
+      attributes: {
+        user: {
+          email: "Email"
+        }
+      },
+      help: {
+        user: {
+          password: "A good password should be at least six characters long"
+        }
+      }
+    }
+  })
+end
+
+def sort_attributes doc
+  doc.dup.traverse do |node|
+    if node.is_a?(Nokogiri::XML::Element)
+      attributes = node.attribute_nodes.sort_by(&:name)
+      attributes.each do |attribute|
+        node.delete(attribute.name)
+        node[attribute.name] = attribute.value
+      end
+    end
+    node
+  end
+end
+
+class ActionView::TestCase
+  def assert_equivalent_xml(expected, actual)
+    expected_xml = Nokogiri::XML(expected)
+    actual_xml = Nokogiri::XML(actual)
+    ignored_attributes = %w(style data-disable-with)
+    equivalent = EquivalentXml.equivalent?(expected_xml, actual_xml, {
+      ignore_attr_values: ignored_attributes
+    }) do |a, b, result|
+      if result === false && b.is_a?(Nokogiri::XML::Element)
+        if b.attr('name') == 'utf8'
+          # Handle wrapped utf8 hidden field for Rails 4.2+
+          result = EquivalentXml.equivalent?(a.child, b)
+        end
+        if b.delete('data-disable-with')
+          # Remove data-disable-with for Rails 5+
+          # Workaround because ignoring in EquivalentXml doesn't work
+          result = EquivalentXml.equivalent?(a, b)
+        end
+        if a.attr('type') == 'datetime' && b.attr('type') == 'datetime-local'
+          a.delete('type')
+          b.delete('type')
+          # Handle new datetime type for Rails 5+
+          result = EquivalentXml.equivalent?(a, b)
+        end
+      end
+      result
+    end
+    assert equivalent, lambda {
+      # using a lambda because diffing is expensive
+      Diffy::Diff.new(
+        sort_attributes(expected_xml.root),
+        sort_attributes(actual_xml.root)
+      ).to_s(:color)
+    }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap_form
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.5.3
 platform: ruby
 authors:
 - Stephen Potenza
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-08 00:00:00.000000000 Z
+date: 2016-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -29,14 +29,14 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
@@ -81,6 +81,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: equivalent-xml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: diffy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: bootstrap_form is a rails form builder that makes it super easy to create
   beautiful-looking forms using Twitter Bootstrap 3+
 email:
@@ -181,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Rails form builder that makes it easy to style forms using Twitter Bootstrap