diff --git a/spec/support/request/admin_helper.rb b/spec/support/request/admin_helper.rb index 63e0476a1a..60e0fcdbd4 100644 --- a/spec/support/request/admin_helper.rb +++ b/spec/support/request/admin_helper.rb @@ -3,13 +3,19 @@ module AdminHelper def toggle_columns(*labels) # open dropdown - find("div#columns-dropdown", text: "COLUMNS").click + # case insensitive search for "Columns" text + find("div#columns-dropdown", text: /columns/i).click - labels.each do |label| - find("div#columns-dropdown div.menu div.menu_item", text: label).click + within "div#columns-dropdown" do + labels.each do |label| + # Convert label to case-insensitive regexp if not one already + label = /#{label}/i unless label.is_a?(Regexp) + + find("div.menu div.menu_item", text: /#{label}/i).click + end end # close dropdown - find("div#columns-dropdown", text: "COLUMNS").click + find("div#columns-dropdown", text: /columns/i).click end end diff --git a/spec/system/admin/bulk_product_update_spec.rb b/spec/system/admin/bulk_product_update_spec.rb index 20b401b34c..308a9097b9 100644 --- a/spec/system/admin/bulk_product_update_spec.rb +++ b/spec/system/admin/bulk_product_update_spec.rb @@ -345,7 +345,7 @@ describe ' login_as_admin visit spree.admin_products_path - toggle_columns "Available On", /^Category?/, "Inherits Properties?", "SKU" + toggle_columns "Available On", /^Category?/i, "Inherits Properties?", "SKU" within "tr#p_#{p.id}" do expect(page).to have_field "product_name", with: p.name @@ -712,7 +712,7 @@ describe ' expect(page).to have_selector "th", text: "ON HAND" expect(page).to have_selector "th", text: "AV. ON" - toggle_columns /^.{0,1}Producer$/ + toggle_columns /^.{0,1}Producer$/i expect(page).to have_no_selector "th", text: "PRODUCER" expect(page).to have_selector "th", text: "NAME"