Merge remote-tracking branch 'upstream/master' into bootstrap-4-rails…

…-5-1

test/bootstrap_form_test.rb

@@ -43,7 +43,12 @@ def setup
   end
 
   test "bootstrap_form_tag allows an empty name for checkboxes" do
-    expected = %{<form accept-charset="UTF-8" action="/users" method="post" role="form"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /></div><div class="form-check"><label class="form-check-label" for="_misc"><input name="[misc]" type="hidden" value="0" /><input class="form-check-input" id="_misc" name="[misc]" type="checkbox" value="1" /> Misc</label></div></form>}
+    checkbox = if ::Rails::VERSION::STRING >= '5.1'
+      %{<div class="checkbox"><label for="misc"><input name="misc" type="hidden" value="0" /><input id="misc" name="misc" type="checkbox" value="1" /> Misc</label></div>}
+    else
+      %{<div class="checkbox"><label for="_misc"><input name="[misc]" type="hidden" value="0" /><input id="_misc" name="[misc]" type="checkbox" value="1" /> Misc</label></div>}
+    end
+    expected = %{<form accept-charset="UTF-8" action="/users" method="post" role="form"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /></div>#{checkbox}</form>}
     assert_equivalent_xml expected, bootstrap_form_tag(url: '/users') { |f| f.check_box :misc }
   end
 

test/bootstrap_selects_test.rb

@@ -35,7 +35,7 @@ def setup
   test 'selects with addons are wrapped correctly' do
     expected = <<-HTML.strip_heredoc
       <div class="form-group">
-        <label class="form-control-label" for="user_status">Status</label>
+        <label class="control-label" for="user_status">Status</label>
         <div class="input-group">
           <span class="input-group-addon">Before</span>
           <select class="form-control" id="user_status" name="user[status]">