Fix tests and code for file and date/time selects.

razrfly · May 29, 2018 · 769cf00 · 769cf00
1 parent 0d76300
commit 769cf00
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/lib/bootstrap_form/form_builder.rb b/lib/bootstrap_form/form_builder.rb
@@ -53,8 +53,10 @@ def initialize(object_name, object, template, options)
 
       define_method(with_method_name) do |name, options = {}, html_options = {}|
         form_group_builder(name, options, html_options) do
-          input_with_error(name) do
-            content_tag(:div, send(without_method_name, name, options, html_options), class: control_specific_class(method_name))
+          content_tag(:div, class: control_specific_class(method_name)) do
+            input_with_error(name) do
+              send(without_method_name, name, options, html_options)
+            end
           end
         end
       end
@@ -65,8 +67,8 @@ def initialize(object_name, object, template, options)
     def file_field_with_bootstrap(name, options = {})
       options = options.reverse_merge(control_class: "custom-file-input")
       form_group_builder(name, options) do
-        input_with_error(name) do
-          content_tag(:div, class: "custom-file") do
+        content_tag(:div, class: "custom-file") do
+          input_with_error(name) do
             placeholder = options.delete(:placeholder) || "Choose file"
             placeholder_opts = { class: "custom-file-label" }
             placeholder_opts[:for] = options[:id] if options[:id].present?

diff --git a/test/bootstrap_fields_test.rb b/test/bootstrap_fields_test.rb
@@ -106,8 +106,8 @@ class BootstrapFieldsTest < ActionView::TestCase
         <div class="custom-file">
           <input class="custom-file-input is-invalid" id="user_misc" name="user[misc]" type="file" />
           <label class="custom-file-label" for="user_misc">Choose file</label>
+          <div class="invalid-feedback">error for test</div>
         </div>
-        <div class="invalid-feedback">error for test</div>
       </div>
     </form>
     HTML

diff --git a/test/bootstrap_selects_test.rb b/test/bootstrap_selects_test.rb
@@ -293,8 +293,8 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
             <select class="form-control is-invalid" id="user_misc_3i" name="user[misc(3i)]">
               #{options_range(start: 1, stop: 31, selected: 3)}
             </select>
+            <div class="invalid-feedback">error for test</div>
           </div>
-          <div class="invalid-feedback">error for test</div>
         </div>
       </form>
       HTML
@@ -395,8 +395,8 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
             <select class="form-control is-invalid" id="user_misc_5i" name="user[misc(5i)]">
               #{options_range(start: "00", stop: "59", selected: "00")}
             </select>
+            <div class="invalid-feedback">error for test</div>
           </div>
-          <div class="invalid-feedback">error for test</div>
         </div>
       </form>
       HTML
@@ -510,8 +510,8 @@ def options_range(start: 1, stop: 31, selected: nil, months: false)
             <select class="form-control is-invalid" id="user_misc_5i" name="user[misc(5i)]">
               #{options_range(start: "00", stop: "59", selected: "00")}
             </select>
+            <div class="invalid-feedback">error for test</div>
           </div>
-          <div class="invalid-feedback">error for test</div>
         </div>
       </form>
       HTML