Merge pull request #3006 from tvdeyen/fix-builds

[CI] Fix builds

spec/libraries/page_layout_spec.rb

@@ -22,8 +22,8 @@ module Alchemy
       context "with a YAML file including a symbol" do
         let(:yaml) { "name: :symbol" }
         before do
-          expect(File).to receive(:exist?).and_return(true)
-          expect(File).to receive(:read).and_return(yaml)
+          allow(File).to receive(:exist?).and_return(true)
+          allow(File).to receive(:read).and_return(yaml)
         end
 
         it "returns the definition without error" do

spec/models/alchemy/element_spec.rb

@@ -233,8 +233,8 @@ module Alchemy
         let(:yaml) { "- name: :symbol" }
 
         before do
-          expect(File).to receive(:exist?).and_return(true)
-          expect(File).to receive(:read).and_return(yaml)
+          allow(File).to receive(:exist?).and_return(true)
+          allow(File).to receive(:read).and_return(yaml)
         end
 
         it "returns the definition without error" do
@@ -246,8 +246,8 @@ module Alchemy
         let(:yaml) { "- default: 2017-12-24" }
 
         before do
-          expect(File).to receive(:exist?).and_return(true)
-          expect(File).to receive(:read).and_return(yaml)
+          allow(File).to receive(:exist?).and_return(true)
+          allow(File).to receive(:read).and_return(yaml)
         end
 
         it "returns the definition without error" do
@@ -259,8 +259,8 @@ module Alchemy
         let(:yaml) { "- format: !ruby/regexp '/\A[^@\s]+@([^@\s]+.)+[^@\s]+\z/'" }
 
         before do
-          expect(File).to receive(:exist?).and_return(true)
-          expect(File).to receive(:read).and_return(yaml)
+          allow(File).to receive(:exist?).and_return(true)
+          allow(File).to receive(:read).and_return(yaml)
         end
 
         it "returns the definition without error" do

spec/rails_helper.rb

@@ -54,18 +54,6 @@
 FactoryBot.definition_file_paths.append(Alchemy::TestSupport.factories_path)
 FactoryBot.find_definitions
 
-Capybara.register_driver :selenium_chrome_headless do |app|
-  Capybara::Selenium::Driver.load_selenium
-  browser_options = ::Selenium::WebDriver::Chrome::Options.new.tap do |opts|
-    opts.args << "--headless"
-    opts.args << "--disable-gpu" if Gem.win_platform?
-    # Workaround https://bugs.chromium.org/p/chromedriver/issues/detail?id=2650&q=load&sort=-id&colspec=ID%20Status%20Pri%20Owner%20Summary
-    opts.args << "--disable-site-isolation-trials"
-    opts.args << "--window-size=1280,800"
-  end
-  Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options)
-end
-
 Shoulda::Matchers.configure do |config|
   config.integrate do |with|
     with.test_framework :rspec
@@ -108,7 +96,10 @@
     end
   end
 
-  config.before(:each, type: :system, js: true) do
-    driven_by :selenium_chrome_headless
+  config.before(:each, type: :system, js: true) do |example|
+    screen_size = example.metadata[:screen_size] || [1280, 800]
+    driven_by(:selenium, using: :headless_chrome, screen_size: screen_size) do |capabilities|
+      capabilities.add_argument("--disable-search-engine-choice-screen")
+    end
   end
 end