Merge pull request #6197 from mamhoff/fix-flaky-specs

Fix flaky specs

Author: tvdeyen

admin/spec/spec_helper.rb

@@ -51,6 +51,7 @@
   browser_options.args << '--headless'
   browser_options.args << '--disable-gpu'
   browser_options.args << '--window-size=1920,1080'
+  browser_options.args << '--disable-backgrounding-occluded-windows'
   Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options)
 end
 Capybara.register_driver :selenium_chrome_headless_docker_friendly do |app|
@@ -60,6 +61,7 @@
   # Sandbox cannot be used inside unprivileged Docker container
   browser_options.args << '--no-sandbox'
   browser_options.args << '--window-size=1240,1400'
+  browser_options.args << '--disable-backgrounding-occluded-windows'
   Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options)
 end
 Capybara.javascript_driver = (ENV['CAPYBARA_DRIVER'] || :selenium_chrome_headless).to_sym

backend/spec/features/admin/configuration/shipping_methods_spec.rb

@@ -35,6 +35,7 @@
       end
 
       click_on "Create"
+      expect(page).to have_content("Shipping Method \"bullock cart\" has been successfully created!")
       expect(current_path).to eql(spree.edit_admin_shipping_method_path(Spree::ShippingMethod.last))
 
       visit spree.new_admin_shipping_method_path

backend/spec/features/admin/orders/customer_returns_spec.rb

@@ -33,25 +33,14 @@ def expect_order_state_label_to_eq(text)
       end
     end
 
-    it 'disables the button at submit', :js do
-      page.execute_script "$('form').submit(function(e) { e.preventDefault()})"
-
-      create_customer_return('receive')
-
-      expect(page).to have_button("Create", disabled: true)
+    it 'disables the button at submit' do
+      expect(page).to have_css('input[type="submit"][data-disable-with="Create"]')
     end
 
     context 'when creating a return with state "In Transit" and then marking it as "Received"' do
       it 'disables the "Receive" button at submit', :js do
         create_customer_return('in_transit')
-
-        page.execute_script "$('form').submit(function(e) { e.preventDefault()})"
-
-        within('[data-hook="rejected_return_items"] tbody tr:nth-child(1)') do
-          click_button('Receive')
-
-          expect(page).to have_button("Receive", disabled: true, wait: 5)
-        end
+        expect(page).to have_css('input[type="submit"][data-disable-with="Receive"]')
       end
 
       it 'marks the order as returned', :js do

backend/spec/features/admin/orders/new_order_spec.rb

@@ -47,12 +47,15 @@
 
     click_on "Payments"
     click_on "Update"
+    expect(page).to have_content("Payment has been successfully created!")
 
     expect(current_path).to eql(spree.admin_order_payments_path(Spree::Order.last))
 
     click_on "Confirm"
     click_on "Complete Order"
 
+    expect(page).to have_content("Order completed")
+
     expect(current_path).to eql(spree.edit_admin_order_path(Spree::Order.last))
 
     click_on "Payments"

backend/spec/features/admin/orders/return_payment_state_spec.rb

@@ -67,14 +67,9 @@ def create_customer_return
     )
   end
 
-  it 'disables the "Create Reimbursement" button at submit', :js do
+  it 'disables the "Create Reimbursement" button at submit' do
     create_customer_return
 
-    page.execute_script "$('form').submit(function(e) { e.preventDefault()})"
-
-    # Create reimbursement
-    click_on 'Create reimbursement'
-
-    expect(page).to have_button("Create reimbursement", disabled: true)
+    expect(page).to have_css("input[type='submit'][data-disable-with='Create reimbursement']")
   end
 end

backend/spec/features/admin/products/edit/images_spec.rb

@@ -98,6 +98,7 @@
         end
 
         click_button "Update"
+        expect(page).to have_content("Image has been successfully created!")
         invalidate_attachment(Spree::Image.first.attachment)
         visit current_path
         expect(page).to have_xpath("//img[contains(@src, 'assets/noimage/mini')]")

backend/spec/spec_helper.rb

@@ -58,6 +58,7 @@
   browser_options.args << '--headless'
   browser_options.args << '--disable-gpu'
   browser_options.args << '--window-size=1920,1080'
+  browser_options.args << '--disable-backgrounding-occluded-windows'
   Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options)
 end
 Capybara.register_driver :selenium_chrome_headless_docker_friendly do |app|
@@ -67,6 +68,7 @@
   # Sandbox cannot be used inside unprivileged Docker container
   browser_options.args << '--no-sandbox'
   browser_options.args << '--window-size=1240,1400'
+  browser_options.args << '--disable-backgrounding-occluded-windows'
   Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options)
 end
 

legacy_promotions/spec/features/backend/promotion_adjustments_spec.rb

@@ -167,13 +167,8 @@
       expect(promotion.actions.first).to be_a(Spree::Promotion::Actions::FreeShipping)
     end
 
-    it "disables the button at submit", :js do
-      page.execute_script "$('form').submit(function(e) { e.preventDefault()})"
-      fill_in "Name", with: "SAVE SAVE SAVE"
-      choose "Apply to all orders"
-      click_button "Create"
-
-      expect(page).to have_button("Create", disabled: true)
+    it "disables the button at submit" do
+      expect(page).to have_css("input[type='submit'][data-disable-with='Create']")
     end
 
     it "should allow an admin to create an automatic promotion" do

legacy_promotions/spec/features/backend/promotions/option_value_rule_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require "rails_helper"
 
 RSpec.feature 'Promotion with option value rule' do
   stub_authorization!

legacy_promotions/spec/features/backend/promotions/product_rule_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require "rails_helper"
 
 RSpec.feature 'Promotion with product rule', js: true do
   stub_authorization!