Merge pull request #6203 from blish/fix-chrome-errors

Fix flaky test errors using chrome 134

Author: tvdeyen

.circleci/config.yml

@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  browser-tools: circleci/browser-tools@1.4.6
+  browser-tools: circleci/browser-tools@1.5.3
   codecov: codecov/[email protected]
 
 executors:
@@ -59,7 +59,9 @@ commands:
   setup:
     steps:
       - checkout
-      - browser-tools/install-chrome
+      - browser-tools/install-chrome:
+          chrome-version: "133.0.6943.53"
+          replace-existing: true
       - run:
           name: Check chrome version
           command: |

admin/lib/solidus_admin/testing_support/feature_helpers.rb

@@ -27,7 +27,10 @@ def find_row_checkbox(text)
       end
 
       def select_row(text)
-        find_row_checkbox(text).check
+        find_row_checkbox(text).tap do |checkbox|
+          checkbox.check
+          checkbox.synchronize { checkbox.checked? }
+        end
       end
     end
   end

admin/lib/solidus_admin/testing_support/shared_examples/promotion_categories_features.rb

@@ -5,7 +5,7 @@
 RSpec.shared_examples_for 'promotion categories features' do
   before { sign_in create(:admin_user, email: "[email protected]") }
 
-  it "lists promotion categories" do
+  it "lists promotion categories", :js do
     create(factory_name, name: "test1", code: "code1")
     create(factory_name, name: "test2", code: "code2")
 
@@ -53,7 +53,7 @@
     expect(page).to have_content("exp.2")
   end
 
-  it 'allows to delete promo category' do
+  it 'allows to bulk delete promo category', :js do
     create(factory_name, name: "Soon to expire", code: "ste.1")
     create(factory_name, name: "Expired", code: "exp.2")
 
@@ -65,8 +65,4 @@
     expect(page).not_to have_content("Expired")
     expect(model_class.count).to eq(1)
   end
-
-  include_examples 'feature: bulk delete resources' do
-    let(:resource_factory) { factory_name }
-  end
 end

admin/spec/features/adjustment_reasons_spec.rb

@@ -3,10 +3,10 @@
 require 'spec_helper'
 require 'solidus_admin/testing_support/shared_examples/bulk_delete_resources'
 
-describe "Adjustment Reasons", :js, type: :feature do
+describe "Adjustment Reasons", type: :feature do
   before { sign_in create(:admin_user, email: '[email protected]') }
 
-  it "lists adjustment reasons and allows deleting them" do
+  it "lists adjustment reasons and allows deleting them", :js do
     create(:adjustment_reason, name: "Default-adjustment-reason")
 
     visit "/admin/adjustment_reasons"
@@ -21,11 +21,6 @@
     expect(page).to be_axe_clean
   end
 
-  include_examples 'feature: bulk delete resources' do
-    let(:resource_factory) { :adjustment_reason }
-    let(:index_path) { "/admin/adjustment_reasons" }
-  end
-
   context "when creating a new adjustment reason" do
     let(:query) { "?page=1&q%5Bname_or_code_cont%5D=new" }
 
@@ -34,10 +29,13 @@
       click_on "Add new"
       expect(page).to have_selector("dialog")
       expect(page).to have_content("New Adjustment Reason")
+    end
+
+    it "is accessible", :js do
       expect(page).to be_axe_clean
     end
 
-    it "closing the modal keeps query params" do
+    it "closing the modal keeps query params", :js do
       within("dialog") { click_on "Cancel" }
       expect(page).not_to have_selector("dialog")
       expect(page.current_url).to include(query)
@@ -77,10 +75,13 @@
       click_on "Good Reason"
       expect(page).to have_selector("dialog")
       expect(page).to have_content("Edit Adjustment Reason")
+    end
+
+    it "is accessible", :js do
       expect(page).to be_axe_clean
     end
 
-    it "closing the modal keeps query params" do
+    it "closing the modal keeps query params", :js do
       within("dialog") { click_on "Cancel" }
       expect(page).not_to have_selector("dialog")
       expect(page.current_url).to include(query)

admin/spec/features/properties_spec.rb

@@ -3,10 +3,10 @@
 require 'spec_helper'
 require 'solidus_admin/testing_support/shared_examples/bulk_delete_resources'
 
-describe "Properties", :js, type: :feature do
+describe "Properties", type: :feature do
   before { sign_in create(:admin_user, email: '[email protected]') }
 
-  it "lists properties and allows deleting them" do
+  it "lists properties and allows deleting them", :js do
     create(:property, name: "Type prop", presentation: "Type prop")
     create(:property, name: "Size", presentation: "Size")
 
@@ -23,11 +23,6 @@
     expect(Spree::Property.count).to eq(1)
   end
 
-  include_examples 'feature: bulk delete resources' do
-    let(:resource_factory) { :property }
-    let(:index_path) { "/admin/properties" }
-  end
-
   context "creating a new property" do
     it "creates a new product property" do
       visit "/admin/properties"

admin/spec/features/refund_reasons_spec.rb

@@ -3,10 +3,10 @@
 require 'spec_helper'
 require 'solidus_admin/testing_support/shared_examples/bulk_delete_resources'
 
-describe "Refund Reasons", :js, type: :feature do
+describe "Refund Reasons", type: :feature do
   before { sign_in create(:admin_user, email: '[email protected]') }
 
-  it "lists refund reasons and allows deleting them" do
+  it "lists refund reasons and allows deleting them", :js do
     create(:refund_reason, name: "Default-refund-reason")
 
     visit "/admin/refund_reasons"
@@ -21,11 +21,6 @@
     expect(page).to be_axe_clean
   end
 
-  include_examples 'feature: bulk delete resources' do
-    let(:resource_factory) { :refund_reason }
-    let(:index_path) { "/admin/refund_reasons" }
-  end
-
   context "when creating a new refund reason" do
     let(:query) { "?page=1&q%5Bname_or_description_cont%5D=Ret" }
 
@@ -34,10 +29,13 @@
       click_on "Add new"
       expect(page).to have_css("dialog")
       expect(page).to have_content("New Refund Reason")
+    end
+
+    it "is accessible", :js do
       expect(page).to be_axe_clean
     end
 
-    it "closing the modal keeps query params" do
+    it "closing the modal keeps query params", :js do
       within("dialog") { click_on "Cancel" }
       expect(page).not_to have_selector("dialog")
       expect(page.current_url).to include(query)
@@ -74,10 +72,13 @@
       click_on "Return process"
       expect(page).to have_css("dialog")
       expect(page).to have_content("Edit Refund Reason")
+    end
+
+    it "is accessible", :js do
       expect(page).to be_axe_clean
     end
 
-    it "closing the modal keeps query params" do
+    it "closing the modal keeps query params", :js do
       within("dialog") { click_on "Cancel" }
       expect(page).not_to have_selector("dialog")
       expect(page.current_url).to include(query)

admin/spec/features/return_reasons_spec.rb

@@ -3,10 +3,10 @@
 require 'spec_helper'
 require 'solidus_admin/testing_support/shared_examples/bulk_delete_resources'
 
-describe "Return Reasons", :js, type: :feature do
+describe "Return Reasons", type: :feature do
   before { sign_in create(:admin_user, email: '[email protected]') }
 
-  it "lists Return Reasons and allows deleting them" do
+  it "lists Return Reasons and allows deleting them", :js do
     create(:return_reason, name: "Default-return-reason")
 
     visit "/admin/return_reasons"
@@ -21,11 +21,6 @@
     expect(page).to be_axe_clean
   end
 
-  include_examples 'feature: bulk delete resources' do
-    let(:resource_factory) { :return_reason }
-    let(:index_path) { "/admin/return_reasons" }
-  end
-
   context "when creating a new return reason" do
     let(:query) { "?page=1&q%5Bname_cont%5D=new" }
 
@@ -34,10 +29,13 @@
       click_on "Add new"
       expect(page).to have_selector("dialog")
       expect(page).to have_content("New Return Reason")
+    end
+
+    it "is accessible", :js do
       expect(page).to be_axe_clean
     end
 
-    it "closing the modal keeps query params" do
+    it "closing the modal keeps query params", :js do
       within("dialog") { click_on "Cancel" }
       expect(page).not_to have_selector("dialog")
       expect(page.current_url).to include(query)
@@ -76,10 +74,13 @@
       click_on "Good Reason"
       expect(page).to have_selector("dialog")
       expect(page).to have_content("Edit Return Reason")
+    end
+
+    it "is accessible", :js do
       expect(page).to be_axe_clean
     end
 
-    it "closing the modal keeps query params", :flaky do
+    it "closing the modal keeps query params", :flaky, :js do
       within("dialog") { click_on "Cancel" }
       expect(page).not_to have_selector("dialog")
       expect(page.current_url).to include(query)

admin/spec/features/roles_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'solidus_admin/testing_support/shared_examples/bulk_delete_resources'
 
-describe "Roles", :js, type: :feature do
+describe "Roles", type: :feature do
   before do
     sign_in create(:admin_user, email: '[email protected]')
   end
@@ -25,12 +25,7 @@
     )
   }
 
-  include_examples 'feature: bulk delete resources' do
-    let(:resource_factory) { :role }
-    let(:index_path) { "/admin/roles" }
-  end
-
-  it "lists roles and allows deleting them" do
+  it "lists roles and allows deleting them", :js do
     create(:role, name: "Customer Role" )
     Spree::Role.find_or_create_by(name: 'admin')
 
@@ -62,10 +57,13 @@
       click_on "Add new"
       expect(page).to have_selector("dialog", wait: 5)
       expect(page).to have_content("New Role")
+    end
+
+    it "is accessible", :js do
       expect(page).to be_axe_clean
     end
 
-    it "closing the modal keeps query params" do
+    it "closing the modal keeps query params", :js do
       within("dialog") { click_on "Cancel" }
       expect(page).not_to have_selector("dialog", wait: 5)
       expect(page.current_url).to include(query)
@@ -129,12 +127,15 @@
       click_on "Reviewer"
       expect(page).to have_selector("dialog", wait: 5)
       expect(page).to have_content("Edit Role")
-      expect(page).to be_axe_clean
       expect(Spree::Role.find_by(name: "Reviewer").permission_set_ids)
-        .to contain_exactly(settings_edit_permission.id)
+      .to contain_exactly(settings_edit_permission.id)
+    end
+
+    it "is accessible", :js do
+      expect(page).to be_axe_clean
     end
 
-    it "closing the modal keeps query params" do
+    it "closing the modal keeps query params", :js do
       within("dialog") { click_on "Cancel" }
       expect(page).not_to have_selector("dialog", wait: 5)
       expect(page.current_url).to include(query)

admin/spec/features/shipping_categories_spec.rb

@@ -3,10 +3,10 @@
 require 'spec_helper'
 require 'solidus_admin/testing_support/shared_examples/bulk_delete_resources'
 
-describe "Shipping Categories", :js, type: :feature do
+describe "Shipping Categories", type: :feature do
   before { sign_in create(:admin_user, email: '[email protected]') }
 
-  it "lists shipping categories and allows deleting them" do
+  it "lists shipping categories and allows deleting them", :js do
     create(:shipping_category, name: "Default-shipping")
 
     visit "/admin/shipping_categories"
@@ -21,11 +21,6 @@
     expect(page).to be_axe_clean
   end
 
-  include_examples 'feature: bulk delete resources' do
-    let(:resource_factory) { :shipping_category }
-    let(:index_path) { "/admin/shipping_categories" }
-  end
-
   context "when creating a new shipping category" do
     let(:query) { "?page=1&q%5Bname_or_description_cont%5D=What" }
 
@@ -34,10 +29,13 @@
       click_on "Add new"
       expect(page).to have_css("dialog")
       expect(page).to have_content("New Shipping Category")
+    end
+
+    it "is accessible", :js do
       expect(page).to be_axe_clean
     end
 
-    it "closing the modal keeps query params" do
+    it "closing the modal keeps query params", :js do
       within("dialog") { click_on "Cancel" }
       expect(page).not_to have_selector("dialog")
       expect(page.current_url).to include(query)
@@ -74,10 +72,13 @@
       click_on "Letter Mail"
       expect(page).to have_css("dialog")
       expect(page).to have_content("Edit Shipping Category")
+    end
+
+    it "is accessible", :js do
       expect(page).to be_axe_clean
     end
 
-    it "closing the modal keeps query params" do
+    it "closing the modal keeps query params", :js do
       within("dialog") { click_on "Cancel" }
       expect(page).not_to have_selector("dialog")
       expect(page.current_url).to include(query)

admin/spec/features/shipping_methods_spec.rb

@@ -2,10 +2,10 @@
 
 require 'spec_helper'
 
-describe "Shipping Methods", :js, type: :feature do
+describe "Shipping Methods", type: :feature do
   before { sign_in create(:admin_user, email: '[email protected]') }
 
-  it "lists shipping methods and allows deleting them" do
+  it "lists shipping methods and allows deleting them", :js do
     create(:shipping_method, name: "FAAAST")
 
     visit "/admin/shipping_methods"