bootstrap_form 2.5.2 → 2.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74371be532df90ad58349ff61a280d5d5181fdd2
-  data.tar.gz: b198550bfafbc2d56416fcc239b3aa75355eb736
+  metadata.gz: 04d47ab6dce9854ae7580743006e9219430dcdc9
+  data.tar.gz: 39317c24d8571eb757babf24bb848d6a9bf67620
 SHA512:
-  metadata.gz: 64aab98c2cc38d0845539909ccff000d7a9e2408eac68f858dfae827596e434de15caeacc6dbe9994ec1853f5fc5becad134641ad98857ba605f5cf29acb08f9
-  data.tar.gz: 3bc51f566eea0f8e87128998803ae6fbd127701aa13a1b8e8b14188859e541e6da5e70b36d698e5263c2ced1f44c9f70e04bd8e21d3a4bc2f411d89ad0d5aced
+  metadata.gz: 2f6cb05043d3866232ca763684370e46ecd2bfc181a682aef0f9785cd8548db050fec163e4523a5b349b639422d1ce406d1d2ff55e524914d13d76ba3f2d7b0c
+  data.tar.gz: bf12eadf490cb9fb286e8d67956881d544699acfa7766c025144c3b7825395d064ce02bafe19a6b966aeaadcdbfef73b54add03925abdb2662c67100d8f0b3b2

data/README.md

@@ -586,24 +586,31 @@ We love pull requests! Here's a quick guide for contributing:
 
 1. Fork the repo.
 
-2. Run the existing test suite:
+2. Install the required dependencies.
+
+```
+bundle install
+bundle exec appraisal install
+```
+
+3. Run the existing test suite:
 
 ```
 $ bundle exec rake -f test/dummy/Rakefile db:create db:migrate RAILS_ENV=test
-$ bundle exec rake
+$ bundle exec appraisal rake test
 ```
 
-3. Add tests for your change.
+4. Add tests for your change.
 
-4. Add your changes and make your test(s) pass. Following the conventions you
+5. Add your changes and make your test(s) pass. Following the conventions you
 see used in the source will increase the chance that your pull request is
 accepted right away.
 
-5. Update the README if necessary.
+6. Update the README if necessary.
 
-6. Add a line to the CHANGELOG for your bug fix or feature.
+7. Add a line to the CHANGELOG for your bug fix or feature.
 
-7. Push to your fork and submit a pull request.
+8. Push to your fork and submit a pull request.
 
 ## Contributors
 

data/lib/bootstrap_form/version.rb

@@ -1,3 +1,3 @@
 module BootstrapForm
-  VERSION = "2.5.2".freeze
+  VERSION = "2.5.3".freeze
 end

data/test/bootstrap_checkbox_test.rb

@@ -9,135 +9,135 @@ class BootstrapCheckboxTest < ActionView::TestCase
 
   test "check_box is wrapped correctly" do
     expected = %{<div class="checkbox"><label for="user_terms"><input name="user[terms]" type="hidden" value="0" /><input id="user_terms" name="user[terms]" type="checkbox" value="1" /> I agree to the terms</label></div>}
-    assert_equal expected, @builder.check_box(:terms, label: 'I agree to the terms')
+    assert_equivalent_xml expected, @builder.check_box(:terms, label: 'I agree to the terms')
   end
 
   test "disabled check_box has proper wrapper classes" do
     expected = %{<div class="checkbox disabled"><label for="user_terms"><input disabled="disabled" name="user[terms]" type="hidden" value="0" /><input disabled="disabled" id="user_terms" name="user[terms]" type="checkbox" value="1" /> I agree to the terms</label></div>}
-    assert_equal expected, @builder.check_box(:terms, label: 'I agree to the terms', disabled: true)
+    assert_equivalent_xml expected, @builder.check_box(:terms, label: 'I agree to the terms', disabled: true)
   end
 
   test "check_box label allows html" do
     expected = %{<div class="checkbox"><label for="user_terms"><input name="user[terms]" type="hidden" value="0" /><input id="user_terms" name="user[terms]" type="checkbox" value="1" /> I agree to the <a href="#">terms</a></label></div>}
-    assert_equal expected, @builder.check_box(:terms, label: %{I agree to the <a href="#">terms</a>}.html_safe)
+    assert_equivalent_xml expected, @builder.check_box(:terms, label: %{I agree to the <a href="#">terms</a>}.html_safe)
   end
 
   test "check_box accepts a block to define the label" do
     expected = %{<div class="checkbox"><label for="user_terms"><input name="user[terms]" type="hidden" value="0" /><input id="user_terms" name="user[terms]" type="checkbox" value="1" /> I agree to the terms</label></div>}
-    assert_equal expected, @builder.check_box(:terms) { "I agree to the terms" }
+    assert_equivalent_xml expected, @builder.check_box(:terms) { "I agree to the terms" }
   end
 
   test "check_box accepts a custom label class" do
     expected = %{<div class="checkbox"><label class="btn" for="user_terms"><input name="user[terms]" type="hidden" value="0" /><input id="user_terms" name="user[terms]" type="checkbox" value="1" /> Terms</label></div>}
-    assert_equal expected, @builder.check_box(:terms, label_class: 'btn')
+    assert_equivalent_xml expected, @builder.check_box(:terms, label_class: 'btn')
   end
 
   test "check_box responds to checked_value and unchecked_value arguments" do
     expected = %{<div class="checkbox"><label for="user_terms"><input name="user[terms]" type="hidden" value="no" /><input id="user_terms" name="user[terms]" type="checkbox" value="yes" /> I agree to the terms</label></div>}
-    assert_equal expected, @builder.check_box(:terms, {label: 'I agree to the terms'}, 'yes', 'no')
+    assert_equivalent_xml expected, @builder.check_box(:terms, {label: 'I agree to the terms'}, 'yes', 'no')
   end
 
   test "inline checkboxes" do
     expected = %{<label class="checkbox-inline" for="user_terms"><input name="user[terms]" type="hidden" value="0" /><input id="user_terms" name="user[terms]" type="checkbox" value="1" /> I agree to the terms</label>}
-    assert_equal expected, @builder.check_box(:terms, label: 'I agree to the terms', inline: true)
+    assert_equivalent_xml expected, @builder.check_box(:terms, label: 'I agree to the terms', inline: true)
   end
 
   test "disabled inline check_box" do
     expected = %{<label class="checkbox-inline disabled" for="user_terms"><input disabled="disabled" name="user[terms]" type="hidden" value="0" /><input disabled="disabled" id="user_terms" name="user[terms]" type="checkbox" value="1" /> I agree to the terms</label>}
-    assert_equal expected, @builder.check_box(:terms, label: 'I agree to the terms', inline: true, disabled: true)
+    assert_equivalent_xml expected, @builder.check_box(:terms, label: 'I agree to the terms', inline: true, disabled: true)
   end
 
   test "inline checkboxes with custom label class" do
     expected = %{<label class="checkbox-inline btn" for="user_terms"><input name="user[terms]" type="hidden" value="0" /><input id="user_terms" name="user[terms]" type="checkbox" value="1" /> Terms</label>}
-    assert_equal expected, @builder.check_box(:terms, inline: true, label_class: 'btn')
+    assert_equivalent_xml expected, @builder.check_box(:terms, inline: true, label_class: 'btn')
   end
 
   test 'collection_check_boxes renders the form_group correctly' do
     collection = [Address.new(id: 1, street: 'Foobar')]
     expected = %{<input id="user_misc" multiple="multiple" name="user[misc][]" type="hidden" value="" /><div class="form-group"><label class="control-label" for="user_misc">This is a checkbox collection</label><div class="checkbox"><label for="user_misc_1"><input id="user_misc_1" name="user[misc][]" type="checkbox" value="1" /> Foobar</label></div><span class="help-block">With a help!</span></div>}
 
-    assert_equal expected, @builder.collection_check_boxes(:misc, collection, :id, :street, label: 'This is a checkbox collection', help: 'With a help!')
+    assert_equivalent_xml expected, @builder.collection_check_boxes(:misc, collection, :id, :street, label: 'This is a checkbox collection', help: 'With a help!')
   end
 
   test 'collection_check_boxes renders multiple checkboxes correctly' do
     collection = [Address.new(id: 1, street: 'Foo'), Address.new(id: 2, street: 'Bar')]
     expected = %{<input id="user_misc" multiple="multiple" name="user[misc][]" type="hidden" value="" /><div class="form-group"><label class="control-label" for="user_misc">Misc</label><div class="checkbox"><label for="user_misc_1"><input id="user_misc_1" name="user[misc][]" type="checkbox" value="1" /> Foo</label></div><div class="checkbox"><label for="user_misc_2"><input id="user_misc_2" name="user[misc][]" type="checkbox" value="2" /> Bar</label></div></div>}
 
-    assert_equal expected, @builder.collection_check_boxes(:misc, collection, :id, :street)
+    assert_equivalent_xml expected, @builder.collection_check_boxes(:misc, collection, :id, :street)
   end
 
   test 'collection_check_boxes renders inline checkboxes correctly' do
     collection = [Address.new(id: 1, street: 'Foo'), Address.new(id: 2, street: 'Bar')]
     expected = %{<input id="user_misc" multiple="multiple" name="user[misc][]" type="hidden" value="" /><div class="form-group"><label class="control-label" for="user_misc">Misc</label><label class="checkbox-inline" for="user_misc_1"><input id="user_misc_1" name="user[misc][]" type="checkbox" value="1" /> Foo</label><label class="checkbox-inline" for="user_misc_2"><input id="user_misc_2" name="user[misc][]" type="checkbox" value="2" /> Bar</label></div>}
 
-    assert_equal expected, @builder.collection_check_boxes(:misc, collection, :id, :street, inline: true)
+    assert_equivalent_xml expected, @builder.collection_check_boxes(:misc, collection, :id, :street, inline: true)
   end
 
   test 'collection_check_boxes renders with checked option correctly' do
     collection = [Address.new(id: 1, street: 'Foo'), Address.new(id: 2, street: 'Bar')]
     expected = %{<input id="user_misc" multiple="multiple" name="user[misc][]" type="hidden" value="" /><div class="form-group"><label class="control-label" for="user_misc">Misc</label><div class="checkbox"><label for="user_misc_1"><input checked="checked" id="user_misc_1" name="user[misc][]" type="checkbox" value="1" /> Foo</label></div><div class="checkbox"><label for="user_misc_2"><input id="user_misc_2" name="user[misc][]" type="checkbox" value="2" /> Bar</label></div></div>}
 
-    assert_equal expected, @builder.collection_check_boxes(:misc, collection, :id, :street, checked: 1)
-    assert_equal expected, @builder.collection_check_boxes(:misc, collection, :id, :street, checked: collection.first)
+    assert_equivalent_xml expected, @builder.collection_check_boxes(:misc, collection, :id, :street, checked: 1)
+    assert_equivalent_xml expected, @builder.collection_check_boxes(:misc, collection, :id, :street, checked: collection.first)
   end
 
   test 'collection_check_boxes renders with multiple checked options correctly' do
     collection = [Address.new(id: 1, street: 'Foo'), Address.new(id: 2, street: 'Bar')]
     expected = %{<input id="user_misc" multiple="multiple" name="user[misc][]" type="hidden" value="" /><div class="form-group"><label class="control-label" for="user_misc">Misc</label><div class="checkbox"><label for="user_misc_1"><input checked="checked" id="user_misc_1" name="user[misc][]" type="checkbox" value="1" /> Foo</label></div><div class="checkbox"><label for="user_misc_2"><input checked="checked" id="user_misc_2" name="user[misc][]" type="checkbox" value="2" /> Bar</label></div></div>}
 
-    assert_equal expected, @builder.collection_check_boxes(:misc, collection, :id, :street, checked: [1, 2])
-    assert_equal expected, @builder.collection_check_boxes(:misc, collection, :id, :street, checked: collection)
+    assert_equivalent_xml expected, @builder.collection_check_boxes(:misc, collection, :id, :street, checked: [1, 2])
+    assert_equivalent_xml expected, @builder.collection_check_boxes(:misc, collection, :id, :street, checked: collection)
   end
 
   test 'collection_check_boxes sanitizes values when generating label `for`' do
     collection = [Address.new(id: 1, street: 'Foo St')]
     expected = %{<input id="user_misc" multiple="multiple" name="user[misc][]" type="hidden" value="" /><div class="form-group"><label class="control-label" for="user_misc">Misc</label><div class="checkbox"><label for="user_misc_foo_st"><input id="user_misc_foo_st" name="user[misc][]" type="checkbox" value="Foo St" /> Foo St</label></div></div>}
 
-    assert_equal expected, @builder.collection_check_boxes(:misc, collection, :street, :street)
+    assert_equivalent_xml expected, @builder.collection_check_boxes(:misc, collection, :street, :street)
   end
 
   test 'collection_check_boxes renders multiple checkboxes with labels defined by Proc :text_method correctly' do
     collection = [Address.new(id: 1, street: 'Foo'), Address.new(id: 2, street: 'Bar')]
     expected = %{<input id="user_misc" multiple="multiple" name="user[misc][]" type="hidden" value="" /><div class="form-group"><label class="control-label" for="user_misc">Misc</label><div class="checkbox"><label for="user_misc_1"><input id="user_misc_1" name="user[misc][]" type="checkbox" value="1" /> ooF</label></div><div class="checkbox"><label for="user_misc_2"><input id="user_misc_2" name="user[misc][]" type="checkbox" value="2" /> raB</label></div></div>}
 
-    assert_equal expected, @builder.collection_check_boxes(:misc, collection, :id, Proc.new { |a| a.street.reverse })
+    assert_equivalent_xml expected, @builder.collection_check_boxes(:misc, collection, :id, Proc.new { |a| a.street.reverse })
   end
 
   test 'collection_check_boxes renders multiple checkboxes with values defined by Proc :value_method correctly' do
     collection = [Address.new(id: 1, street: 'Foo'), Address.new(id: 2, street: 'Bar')]
     expected = %{<input id="user_misc" multiple="multiple" name="user[misc][]" type="hidden" value="" /><div class="form-group"><label class="control-label" for="user_misc">Misc</label><div class="checkbox"><label for="user_misc_address_1"><input id="user_misc_address_1" name="user[misc][]" type="checkbox" value="address_1" /> Foo</label></div><div class="checkbox"><label for="user_misc_address_2"><input id="user_misc_address_2" name="user[misc][]" type="checkbox" value="address_2" /> Bar</label></div></div>}
 
-    assert_equal expected, @builder.collection_check_boxes(:misc, collection, Proc.new { |a| "address_#{a.id}" }, :street)
+    assert_equivalent_xml expected, @builder.collection_check_boxes(:misc, collection, Proc.new { |a| "address_#{a.id}" }, :street)
   end
 
   test 'collection_check_boxes renders multiple checkboxes with labels defined by lambda :text_method correctly' do
     collection = [Address.new(id: 1, street: 'Foo'), Address.new(id: 2, street: 'Bar')]
     expected = %{<input id="user_misc" multiple="multiple" name="user[misc][]" type="hidden" value="" /><div class="form-group"><label class="control-label" for="user_misc">Misc</label><div class="checkbox"><label for="user_misc_1"><input id="user_misc_1" name="user[misc][]" type="checkbox" value="1" /> ooF</label></div><div class="checkbox"><label for="user_misc_2"><input id="user_misc_2" name="user[misc][]" type="checkbox" value="2" /> raB</label></div></div>}
 
-    assert_equal expected, @builder.collection_check_boxes(:misc, collection, :id, lambda { |a| a.street.reverse })
+    assert_equivalent_xml expected, @builder.collection_check_boxes(:misc, collection, :id, lambda { |a| a.street.reverse })
   end
 
   test 'collection_check_boxes renders multiple checkboxes with values defined by lambda :value_method correctly' do
     collection = [Address.new(id: 1, street: 'Foo'), Address.new(id: 2, street: 'Bar')]
     expected = %{<input id="user_misc" multiple="multiple" name="user[misc][]" type="hidden" value="" /><div class="form-group"><label class="control-label" for="user_misc">Misc</label><div class="checkbox"><label for="user_misc_address_1"><input id="user_misc_address_1" name="user[misc][]" type="checkbox" value="address_1" /> Foo</label></div><div class="checkbox"><label for="user_misc_address_2"><input id="user_misc_address_2" name="user[misc][]" type="checkbox" value="address_2" /> Bar</label></div></div>}
 
-    assert_equal expected, @builder.collection_check_boxes(:misc, collection, lambda { |a| "address_#{a.id}" }, :street)
+    assert_equivalent_xml expected, @builder.collection_check_boxes(:misc, collection, lambda { |a| "address_#{a.id}" }, :street)
   end
 
   test 'collection_check_boxes renders with checked option correctly with Proc :value_method' do
     collection = [Address.new(id: 1, street: 'Foo'), Address.new(id: 2, street: 'Bar')]
     expected = %{<input id="user_misc" multiple="multiple" name="user[misc][]" type="hidden" value="" /><div class="form-group"><label class="control-label" for="user_misc">Misc</label><div class="checkbox"><label for="user_misc_address_1"><input checked="checked" id="user_misc_address_1" name="user[misc][]" type="checkbox" value="address_1" /> Foo</label></div><div class="checkbox"><label for="user_misc_address_2"><input id="user_misc_address_2" name="user[misc][]" type="checkbox" value="address_2" /> Bar</label></div></div>}
 
-    assert_equal expected, @builder.collection_check_boxes(:misc, collection, Proc.new { |a| "address_#{a.id}" }, :street, checked: "address_1")
-    assert_equal expected, @builder.collection_check_boxes(:misc, collection, Proc.new { |a| "address_#{a.id}" }, :street, checked: collection.first)
+    assert_equivalent_xml expected, @builder.collection_check_boxes(:misc, collection, Proc.new { |a| "address_#{a.id}" }, :street, checked: "address_1")
+    assert_equivalent_xml expected, @builder.collection_check_boxes(:misc, collection, Proc.new { |a| "address_#{a.id}" }, :street, checked: collection.first)
   end
 
   test 'collection_check_boxes renders with multiple checked options correctly with lambda :value_method' do
     collection = [Address.new(id: 1, street: 'Foo'), Address.new(id: 2, street: 'Bar')]
     expected = %{<input id="user_misc" multiple="multiple" name="user[misc][]" type="hidden" value="" /><div class="form-group"><label class="control-label" for="user_misc">Misc</label><div class="checkbox"><label for="user_misc_address_1"><input checked="checked" id="user_misc_address_1" name="user[misc][]" type="checkbox" value="address_1" /> Foo</label></div><div class="checkbox"><label for="user_misc_address_2"><input checked="checked" id="user_misc_address_2" name="user[misc][]" type="checkbox" value="address_2" /> Bar</label></div></div>}
 
-    assert_equal expected, @builder.collection_check_boxes(:misc, collection, lambda { |a| "address_#{a.id}" }, :street, checked: ["address_1", "address_2"])
-    assert_equal expected, @builder.collection_check_boxes(:misc, collection, lambda { |a| "address_#{a.id}" }, :street, checked: collection)
+    assert_equivalent_xml expected, @builder.collection_check_boxes(:misc, collection, lambda { |a| "address_#{a.id}" }, :street, checked: ["address_1", "address_2"])
+    assert_equivalent_xml expected, @builder.collection_check_boxes(:misc, collection, lambda { |a| "address_#{a.id}" }, :street, checked: collection)
   end
 
 

data/test/bootstrap_fields_test.rb

@@ -9,93 +9,93 @@ class BootstrapFieldsTest < ActionView::TestCase
 
   test "color fields are wrapped correctly" do
     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="color" value="#000000" /></div>}
-    assert_equal expected, @builder.color_field(:misc)
+    assert_equivalent_xml expected, @builder.color_field(:misc)
   end
 
   test "date fields are wrapped correctly" do
     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 "date time fields are wrapped correctly" do
     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="datetime" /></div>}
-    assert_equal expected, @builder.datetime_field(:misc)
+    assert_equivalent_xml expected, @builder.datetime_field(:misc)
   end
 
   test "date time local fields are wrapped correctly" do
     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="datetime-local" /></div>}
-    assert_equal expected, @builder.datetime_local_field(:misc)
+    assert_equivalent_xml expected, @builder.datetime_local_field(:misc)
   end
 
   test "email fields are wrapped correctly" do
     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="email" /></div>}
-    assert_equal expected, @builder.email_field(:misc)
+    assert_equivalent_xml expected, @builder.email_field(:misc)
   end
 
   test "file fields are wrapped correctly" do
     expected = %{<div class="form-group"><label class="control-label" for="user_misc">Misc</label><input id="user_misc" name="user[misc]" type="file" /></div>}
-    assert_equal expected, @builder.file_field(:misc)
+    assert_equivalent_xml expected, @builder.file_field(:misc)
   end
 
   test "hidden fields are supported" do
     expected = %{<input id="user_misc" name="user[misc]" type="hidden" />}
-    assert_equal expected, @builder.hidden_field(:misc)
+    assert_equivalent_xml expected, @builder.hidden_field(:misc)
   end
 
   test "month local fields are wrapped correctly" do
     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="month" /></div>}
-    assert_equal expected, @builder.month_field(:misc)
+    assert_equivalent_xml expected, @builder.month_field(:misc)
   end
 
   test "number fields are wrapped correctly" do
     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="number" /></div>}
-    assert_equal expected, @builder.number_field(:misc)
+    assert_equivalent_xml expected, @builder.number_field(:misc)
   end
 
   test "password fields are wrapped correctly" do
     expected = %{<div class="form-group"><label class="control-label" for="user_password">Password</label><input class="form-control" id="user_password" name="user[password]" type="password" /><span class="help-block">A good password should be at least six characters long</span></div>}
-    assert_equal expected, @builder.password_field(:password)
+    assert_equivalent_xml expected, @builder.password_field(:password)
   end
 
   test "phone/telephone fields are wrapped correctly" do
     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="tel" /></div>}
-    assert_equal expected, @builder.phone_field(:misc)
-    assert_equal expected, @builder.telephone_field(:misc)
+    assert_equivalent_xml expected, @builder.phone_field(:misc)
+    assert_equivalent_xml expected, @builder.telephone_field(:misc)
   end
 
   test "range fields are wrapped correctly" do
     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="range" /></div>}
-    assert_equal expected, @builder.range_field(:misc)
+    assert_equivalent_xml expected, @builder.range_field(:misc)
   end
 
   test "search fields are wrapped correctly" do
     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="search" /></div>}
-    assert_equal expected, @builder.search_field(:misc)
+    assert_equivalent_xml expected, @builder.search_field(:misc)
   end
 
   test "text areas are wrapped correctly" do
     expected = %{<div class="form-group"><label class="control-label" for="user_comments">Comments</label><textarea class="form-control" id="user_comments" name="user[comments]">\nmy comment</textarea></div>}
-    assert_equal expected, @builder.text_area(:comments)
+    assert_equivalent_xml expected, @builder.text_area(:comments)
   end
 
   test "text fields are wrapped correctly" do
     expected = %{<div class="form-group"><label class="control-label required" for="user_email">Email</label><input class="form-control" id="user_email" name="user[email]" type="text" value="steve@example.com" /></div>}
-    assert_equal expected, @builder.text_field(:email)
+    assert_equivalent_xml expected, @builder.text_field(:email)
   end
 
   test "time fields are wrapped correctly" do
     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="time" /></div>}
-    assert_equal expected, @builder.time_field(:misc)
+    assert_equivalent_xml expected, @builder.time_field(:misc)
   end
 
   test "url fields are wrapped correctly" do
     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="url" /></div>}
-    assert_equal expected, @builder.url_field(:misc)
+    assert_equivalent_xml expected, @builder.url_field(:misc)
   end
 
   test "week fields are wrapped correctly" do
     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="week" /></div>}
-    assert_equal expected, @builder.week_field(:misc)
+    assert_equivalent_xml expected, @builder.week_field(:misc)
   end
 
   test "bootstrap_form_for helper works for associations" do
@@ -108,7 +108,7 @@ class BootstrapFieldsTest < ActionView::TestCase
     end
 
     expected = %{<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post" role="form"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /></div><div class="form-group"><label class="control-label" for="user_address_attributes_street">Street</label><input class="form-control" id="user_address_attributes_street" name="user[address_attributes][street]" type="text" value="123 Main Street" /></div></form>}
-    assert_equal expected, output
+    assert_equivalent_xml expected, output
   end
 
   test "bootstrap_form_for helper works for serialized hash attributes" do
@@ -121,7 +121,7 @@ class BootstrapFieldsTest < ActionView::TestCase
     end
 
     expected = %{<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post" role="form"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /></div><div class="form-group"><label class="control-label" for="user_preferences_favorite_color">Favorite color</label><input class="form-control" id="user_preferences_favorite_color" name="user[preferences][favorite_color]" type="text" value="cerulean" /></div></form>}
-    assert_equal expected, output
+    assert_equivalent_xml expected, output
   end
 
   test "fields_for correctly passes horizontal style from parent builder" do
@@ -134,7 +134,7 @@ class BootstrapFieldsTest < ActionView::TestCase
     end
 
     expected = %{<form accept-charset="UTF-8" action="/users" class="form-horizontal" id="new_user" method="post" role="form"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /></div><div class="form-group"><label class="control-label col-sm-2" for="user_address_attributes_street">Street</label><div class="col-sm-10"><input class="form-control" id="user_address_attributes_street" name="user[address_attributes][street]" type="text" value="123 Main Street" /></div></div></form>}
-    assert_equal expected, output
+    assert_equivalent_xml expected, output
   end
 
   test "fields_for correctly passes inline style from parent builder" do
@@ -147,6 +147,6 @@ class BootstrapFieldsTest < ActionView::TestCase
     end
 
     expected = %{<form accept-charset="UTF-8" action="/users" class="form-inline" id="new_user" method="post" role="form"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /></div><div class="form-group"><label class="control-label" for="user_address_attributes_street">Street</label><input class="form-control" id="user_address_attributes_street" name="user[address_attributes][street]" type="text" value="123 Main Street" /></div></form>}
-    assert_equal expected, output
+    assert_equivalent_xml expected, output
   end
 end

data/test/bootstrap_form_group_test.rb

@@ -9,52 +9,52 @@ class BootstrapFormGroupTest < ActionView::TestCase
 
   test "changing the label text via the label option parameter" do
     expected = %{<div class="form-group"><label class="control-label required" for="user_email">Email Address</label><input class="form-control" id="user_email" name="user[email]" type="text" value="steve@example.com" /></div>}
-    assert_equal expected, @builder.text_field(:email, label: 'Email Address')
+    assert_equivalent_xml expected, @builder.text_field(:email, label: 'Email Address')
   end
 
   test "changing the label text via the html_options label hash" do
     expected = %{<div class="form-group"><label class="control-label required" for="user_email">Email Address</label><input class="form-control" id="user_email" name="user[email]" type="text" value="steve@example.com" /></div>}
-    assert_equal expected, @builder.text_field(:email, label: {text: 'Email Address'})
+    assert_equivalent_xml expected, @builder.text_field(:email, label: {text: 'Email Address'})
   end
 
   test "hiding a label" do
     expected = %{<div class="form-group"><label class="sr-only control-label required" for="user_email">Email</label><input class="form-control" id="user_email" name="user[email]" type="text" value="steve@example.com" /></div>}
-    assert_equal expected, @builder.text_field(:email, hide_label: true)
+    assert_equivalent_xml expected, @builder.text_field(:email, hide_label: true)
   end
 
   test "adding a custom label class via the label_class parameter" do
     expected = %{<div class="form-group"><label class="btn control-label required" for="user_email">Email</label><input class="form-control" id="user_email" name="user[email]" type="text" value="steve@example.com" /></div>}
-    assert_equal expected, @builder.text_field(:email, label_class: 'btn')
+    assert_equivalent_xml expected, @builder.text_field(:email, label_class: 'btn')
   end
 
   test "adding a custom label class via the html_options label hash" do
     expected = %{<div class="form-group"><label class="btn control-label required" for="user_email">Email</label><input class="form-control" id="user_email" name="user[email]" type="text" value="steve@example.com" /></div>}
-    assert_equal expected, @builder.text_field(:email, label: {class: 'btn'})
+    assert_equivalent_xml expected, @builder.text_field(:email, label: {class: 'btn'})
   end
 
   test "adding a custom label and changing the label text via the html_options label hash" do
     expected = %{<div class="form-group"><label class="btn control-label required" for="user_email">Email Address</label><input class="form-control" id="user_email" name="user[email]" type="text" value="steve@example.com" /></div>}
-    assert_equal expected, @builder.text_field(:email, label: {class: 'btn', text: "Email Address"})
+    assert_equivalent_xml expected, @builder.text_field(:email, label: {class: 'btn', text: "Email Address"})
   end
 
   test "skipping a label" do
     expected = %{<div class="form-group"><input class="form-control" id="user_email" name="user[email]" type="text" value="steve@example.com" /></div>}
-    assert_equal expected, @builder.text_field(:email, skip_label: true)
+    assert_equivalent_xml expected, @builder.text_field(:email, skip_label: true)
   end
 
   test "preventing a label from having the required class" do
     expected = %{<div class="form-group"><label class="control-label" for="user_email">Email</label><input class="form-control" id="user_email" name="user[email]" type="text" value="steve@example.com" /></div>}
-    assert_equal expected, @builder.text_field(:email, skip_required: true)
+    assert_equivalent_xml expected, @builder.text_field(:email, skip_required: true)
   end
 
   test "adding prepend text" do
     expected = %{<div class="form-group"><label class="control-label required" for="user_email">Email</label><div class="input-group"><span class="input-group-addon">@</span><input class="form-control" id="user_email" name="user[email]" type="text" value="steve@example.com" /></div></div>}
-    assert_equal expected, @builder.text_field(:email, prepend: '@')
+    assert_equivalent_xml expected, @builder.text_field(:email, prepend: '@')
   end
 
   test "adding append text" do
     expected = %{<div class="form-group"><label class="control-label required" for="user_email">Email</label><div class="input-group"><input class="form-control" id="user_email" name="user[email]" type="text" value="steve@example.com" /><span class="input-group-addon">.00</span></div></div>}
-    assert_equal expected, @builder.text_field(:email, append: '.00')
+    assert_equivalent_xml expected, @builder.text_field(:email, append: '.00')
   end
 
   test "append and prepend button" do
@@ -66,29 +66,29 @@ class BootstrapFormGroupTest < ActionView::TestCase
     before_button = prefix + button + field + suffix
     both_button = prefix + button + field + button  + suffix
     button_src = link_to("Click", "#", class: "btn btn-default")
-    assert_equal after_button, @builder.text_field(:email, append: button_src)
-    assert_equal before_button, @builder.text_field(:email, prepend: button_src)
-    assert_equal both_button, @builder.text_field(:email, append: button_src, prepend: button_src)
+    assert_equivalent_xml after_button, @builder.text_field(:email, append: button_src)
+    assert_equivalent_xml before_button, @builder.text_field(:email, prepend: button_src)
+    assert_equivalent_xml both_button, @builder.text_field(:email, append: button_src, prepend: button_src)
   end
 
   test "adding both prepend and append text" do
     expected = %{<div class="form-group"><label class="control-label required" for="user_email">Email</label><div class="input-group"><span class="input-group-addon">$</span><input class="form-control" id="user_email" name="user[email]" type="text" value="steve@example.com" /><span class="input-group-addon">.00</span></div></div>}
-    assert_equal expected, @builder.text_field(:email, prepend: '$', append: '.00')
+    assert_equivalent_xml expected, @builder.text_field(:email, prepend: '$', append: '.00')
   end
 
   test "help messages for default forms" do
     expected = %{<div class="form-group"><label class="control-label required" for="user_email">Email</label><input class="form-control" id="user_email" name="user[email]" type="text" value="steve@example.com" /><span class="help-block">This is required</span></div>}
-    assert_equal expected, @builder.text_field(:email, help: 'This is required')
+    assert_equivalent_xml expected, @builder.text_field(:email, help: 'This is required')
   end
 
   test "help messages for horizontal forms" do
     expected = %{<div class="form-group"><label class="control-label col-sm-2 required" for="user_email">Email</label><div class="col-sm-10"><input class="form-control" id="user_email" name="user[email]" type="text" value="steve@example.com" /><span class="help-block">This is required</span></div></div>}
-    assert_equal expected, @horizontal_builder.text_field(:email, help: "This is required")
+    assert_equivalent_xml expected, @horizontal_builder.text_field(:email, help: "This is required")
   end
 
   test "help messages to look up I18n automatically" do
     expected = %{<div class="form-group"><label class="control-label" for="user_password">Password</label><input class="form-control" id="user_password" name="user[password]" type="text" value="secret" /><span class="help-block">A good password should be at least six characters long</span></div>}
-    assert_equal expected, @builder.text_field(:password)
+    assert_equivalent_xml expected, @builder.text_field(:password)
   end
 
   test "help messages to warn about deprecated I18n key" do
@@ -111,7 +111,7 @@ class BootstrapFormGroupTest < ActionView::TestCase
 
   test "help messages to ignore translation when user disables help" do
     expected = %{<div class="form-group"><label class="control-label" for="user_password">Password</label><input class="form-control" id="user_password" name="user[password]" type="text" value="secret" /></div>}
-    assert_equal expected, @builder.text_field(:password, help: false)
+    assert_equivalent_xml expected, @builder.text_field(:password, help: false)
   end
 
   test "form_group creates a valid structure and allows arbitrary html to be added via a block" do
@@ -120,7 +120,7 @@ class BootstrapFormGroupTest < ActionView::TestCase
     end
 
     expected = %{<div class="form-group"><label class="control-label col-sm-2" for="user_nil">Foo</label><div class="col-sm-10"><p class="form-control-static">Bar</p></div></div>}
-    assert_equal expected, output
+    assert_equivalent_xml expected, output
   end
 
   test "form_group adds a spacer when no label exists for a horizontal form" do
@@ -129,7 +129,7 @@ class BootstrapFormGroupTest < ActionView::TestCase
     end
 
     expected = %{<div class="form-group"><div class="col-sm-10 col-sm-offset-2"><p class="form-control-static">Bar</p></div></div>}
-    assert_equal expected, output
+    assert_equivalent_xml expected, output
   end
 
   test "form_group renders the label correctly" do
@@ -138,7 +138,7 @@ class BootstrapFormGroupTest < ActionView::TestCase
     end
 
     expected = %{<div class="form-group"><label class="control-label col-sm-2 required" for="user_email">Custom Control</label><div class="col-sm-10"><p class="form-control-static">Bar</p></div></div>}
-    assert_equal expected, output
+    assert_equivalent_xml expected, output
   end
 
   test "form_group accepts class thorugh options hash" do
@@ -147,7 +147,7 @@ class BootstrapFormGroupTest < ActionView::TestCase
     end
 
     expected = %{<div class="form-group foo"><div class="col-sm-10 col-sm-offset-2"><p class="form-control-static">Bar</p></div></div>}
-    assert_equal expected, output
+    assert_equivalent_xml expected, output
   end
 
   test "form_group accepts class thorugh options hash without needing a name" do
@@ -156,7 +156,7 @@ class BootstrapFormGroupTest < ActionView::TestCase
     end
 
     expected = %{<div class="form-group foo"><div class="col-sm-10 col-sm-offset-2"><p class="form-control-static">Bar</p></div></div>}
-    assert_equal expected, output
+    assert_equivalent_xml expected, output
   end
 
   test "form_group overrides the label's 'class' and 'for' attributes if others are passed" do
@@ -165,7 +165,7 @@ class BootstrapFormGroupTest < ActionView::TestCase
     end
 
     expected = %{<div class="form-group"><label class="foo control-label col-sm-2" for="bar">Custom Control</label><div class="col-sm-10"><p class="form-control-static">Bar</p></div></div>}
-    assert_equal expected, output
+    assert_equivalent_xml expected, output
   end
 
   test 'form_group renders the "error" class and message corrrectly when object is invalid' do
@@ -177,12 +177,12 @@ class BootstrapFormGroupTest < ActionView::TestCase
     end
 
     expected = %{<div class="form-group has-error"><p class="form-control-static">Bar</p><span class="help-block">can&#39;t be blank, is too short (minimum is 5 characters)</span></div>}
-    assert_equal expected, output
+    assert_equivalent_xml expected, output
   end
 
   test "adds class to wrapped form_group by a field" do
     expected = %{<div class="form-group none-margin"><label class="control-label" for="user_misc">Misc</label><input class="form-control" id="user_misc" name="user[misc]" type="search" /></div>}
-    assert_equal expected, @builder.search_field(:misc, wrapper_class: 'none-margin')
+    assert_equivalent_xml expected, @builder.search_field(:misc, wrapper_class: 'none-margin')
   end
 
   test "adds class to wrapped form_group by a field with errors" do
@@ -190,7 +190,7 @@ class BootstrapFormGroupTest < ActionView::TestCase
     @user.valid?
 
     expected = %{<div class="form-group none-margin has-error"><div class="field_with_errors"><label class="control-label required" for="user_email">Email</label></div><div class="field_with_errors"><input class="form-control" id="user_email" name="user[email]" type="email" /></div><span class="help-block">can&#39;t be blank, is too short (minimum is 5 characters)</span></div>}
-    assert_equal expected, @builder.email_field(:email, wrapper_class: 'none-margin')
+    assert_equivalent_xml expected, @builder.email_field(:email, wrapper_class: 'none-margin')
   end
 
   test "adds class to wrapped form_group by a field with errors when bootstrap_form_for is used" do
@@ -202,7 +202,7 @@ class BootstrapFormGroupTest < ActionView::TestCase
     end
 
     expected = %{<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post" role="form"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /></div><div class="form-group none-margin has-error"><label class="control-label required" for="user_email">Email</label><input class="form-control" id="user_email" name="user[email]" type="text" /><span class="help-block">can&#39;t be blank, is too short (minimum is 5 characters)</span></div></form>}
-    assert_equal expected, output
+    assert_equivalent_xml expected, output
   end
 
   test "adds offset for form_group without label" do
@@ -211,7 +211,7 @@ class BootstrapFormGroupTest < ActionView::TestCase
     end
 
     expected = %{<div class="form-group"><div class="col-sm-10 col-sm-offset-2"><input class="btn btn-default" name="commit" type="submit" value="Create User" /></div></div>}
-    assert_equal expected, output
+    assert_equivalent_xml expected, output
   end
 
   test "adds offset for form_group without label but specific label_col" do
@@ -220,12 +220,12 @@ class BootstrapFormGroupTest < ActionView::TestCase
     end
 
     expected = %{<div class="form-group"><div class="col-sm-8 col-sm-offset-5"><input class="btn btn-default" name="commit" type="submit" value="Create User" /></div></div>}
-    assert_equal expected, output
+    assert_equivalent_xml expected, output
   end
 
   test "adding an icon to a field" do
     expected = %{<div class="form-group has-feedback"><label class="control-label" for="user_misc">Misc</label><input class="form-control" id="user_misc" name="user[misc]" type="email" /><span class="glyphicon glyphicon-ok form-control-feedback"></span></div>}
-    assert_equal expected, @builder.email_field(:misc, icon: 'ok')
+    assert_equivalent_xml expected, @builder.email_field(:misc, icon: 'ok')
   end
 
   test "single form_group call in horizontal form should not be smash design" do
@@ -237,17 +237,17 @@ class BootstrapFormGroupTest < ActionView::TestCase
     output = output + @horizontal_builder.text_field(:email)
 
     expected = %{<div class="form-group"><div class="col-sm-10 col-sm-offset-2">Hallo</div></div><div class="form-group"><label class="control-label col-sm-2 required" for="user_email">Email</label><div class="col-sm-10"><input class="form-control" id="user_email" name="user[email]" type="text" value="steve@example.com" /></div></div>}
-    assert_equal expected, output
+    assert_equivalent_xml expected, output
   end
 
   test "adds data-attributes (or any other options) to wrapper" do
     expected = %{<div class="form-group" data-foo="bar"><label class="control-label" for="user_misc">Misc</label><input class="form-control" id="user_misc" name="user[misc]" type="search" /></div>}
-    assert_equal expected, @builder.search_field(:misc, wrapper: { data: { foo: 'bar' } })
+    assert_equivalent_xml expected, @builder.search_field(:misc, wrapper: { data: { foo: 'bar' } })
   end
 
   test "passing options to a form control get passed through" do
     expected = %{<div class="form-group"><label class="control-label required" for="user_email">Email</label><input autofocus="autofocus" class="form-control" id="user_email" name="user[email]" type="text" value="steve@example.com" /></div>}
-    assert_equal expected, @builder.text_field(:email, autofocus: true)
+    assert_equivalent_xml expected, @builder.text_field(:email, autofocus: true)
   end
 
   test "doesn't throw undefined method error when the content block returns nil" do
@@ -256,12 +256,12 @@ class BootstrapFormGroupTest < ActionView::TestCase
     end
 
     expected = %{<div class="form-group"><label class="control-label" for="user_nil">Foo</label></div>}
-    assert_equal expected, output
+    assert_equivalent_xml expected, output
   end
 
   test "custom form group layout option" do
     expected = %{<form accept-charset="UTF-8" action="/users" class="form-horizontal" id="new_user" method="post" role="form"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /></div><div class="form-group"><label class="control-label required" for="user_email">Email</label><input class="form-control" id="user_email" name="user[email]" type="email" value="steve@example.com" /></div></form>}
-    assert_equal expected, bootstrap_form_for(@user, layout: :horizontal) { |f| f.email_field :email, layout: :inline }
+    assert_equivalent_xml expected, bootstrap_form_for(@user, layout: :horizontal) { |f| f.email_field :email, layout: :inline }
   end
 
   test "non-default column span on form is reflected in form_group" do
@@ -271,7 +271,7 @@ class BootstrapFormGroupTest < ActionView::TestCase
     end
 
     expected = %{<div class="form-group"><div class="col-sm-9 col-sm-offset-3"><p class="form-control-static">Bar</p></div></div>}
-    assert_equal expected, output
+    assert_equivalent_xml expected, output
   end
 
   test "non-default column span on form isn't mutated" do
@@ -279,11 +279,11 @@ class BootstrapFormGroupTest < ActionView::TestCase
     output = frozen_horizontal_builder.form_group { 'test' }
 
     expected = %{<div class="form-group"><div class="col-sm-9 col-sm-offset-3">test</div></div>}
-    assert_equal expected, output
+    assert_equivalent_xml expected, output
   end
 
   test ":input_group_class should apply to input-group" do
     expected = %{<div class="form-group"><label class="control-label required" for="user_email">Email</label><div class="input-group input-group-lg"><input class="form-control" id="user_email" name="user[email]" type="email" value="steve@example.com" /><span class="input-group-btn"><input class="btn btn-primary" name="commit" type="submit" value="Subscribe" /></span></div></div>}
-    assert_equal expected, @builder.email_field(:email, append: @builder.primary('Subscribe'), input_group_class: 'input-group-lg')
+    assert_equivalent_xml expected, @builder.email_field(:email, append: @builder.primary('Subscribe'), input_group_class: 'input-group-lg')
   end
 end