Refs #37382 - pr fixes

theforeman · Jan 14, 2025 · 6d846da · 6d846da
1 parent e2a89e5
commit 6d846da
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/views/nic/_base_form.html.erb b/app/views/nic/_base_form.html.erb
@@ -33,10 +33,10 @@
               { :label => _("IPv4 Subnet"),
               :label_help => _("IPv4 Subnet with associated TFTP smart proxy is required for PXE based provisioning."),
               :label_help_options => { :rel => 'popover-modal' },
-              :class => 'interface_subnet' } %>
+              :class => 'interface_subnet include_blank' } %>
 <%= nic_subnet_field f, :subnet6_id, :"Subnet::Ipv6",
               { :label => _("IPv6 Subnet"),
-              :class => 'interface_subnet6' } %>
+              :class => 'interface_subnet6 include_blank' } %>
 <%= text_f f, :ip,
               :class => :interface_ip,
               :label => _("IPv4 Address"),

diff --git a/test/integration_test_helper.rb b/test/integration_test_helper.rb
@@ -164,7 +164,9 @@ def select2_chosen_selector(name)
   def select2(value, attrs)
     find(select2_selector(attrs[:from]), visible: false).ancestor('.select2-container').click
     wait_for { find('.select2-search__field').visible? rescue false }
-    wait_for { find(".select2-search__field").set(value) }
+    search_field = find('.select2-search__field')
+    # set(value) errors on not interactable error even though the element is visible and not disabled
+    page.execute_script("arguments[0].value = arguments[1];", search_field.native, value)
     wait_for { find('.select2-results').visible? rescue false }
     within ".select2-results__options" do
       wait_for { find(".select2-results__options li", text: value).visible? rescue false }