Merge remote-tracking branch 'parent/main' into kbtopic-remove-quote

spec/support/browser_errors.rb

@@ -9,29 +9,36 @@ end
 RSpec.configure do |config|
   config.include BrowserErrorsHelpers, :js, type: :system
 
-  config.before(:each, :js, type: :system) do
+  config.before(:each, :js, type: :system) do |example|
     @ignored_js_errors_for_spec = []
+
+    example.metadata[:js_console_messages] ||= []
+    Capybara.current_session.driver.with_playwright_page do |page|
+      page.on('console', lambda { |msg|
+        example.metadata[:js_console_messages] << { type: msg.type, text: msg.text, location: msg.location }
+      })
+    end
   end
 
-  config.after(:each, :js, type: :system) do
+  config.after(:each, :js, type: :system) do |example|
     # Classes of intermittent ignorable errors
     ignored_errors = [
       /Error while trying to use the following icon from the Manifest/, # https://github.com/mastodon/mastodon/pull/30793
       /Manifest: Line: 1, column: 1, Syntax error/, # Similar parsing/interruption issue as above
     ].concat(@ignored_js_errors_for_spec)
 
-    errors = page.driver.browser.logs.get(:browser).reject do |error|
-      ignored_errors.any? { |pattern| pattern.match(error.message) }
+    errors = example.metadata[:js_console_messages].reject do |msg|
+      ignored_errors.any? { |pattern| pattern.match(msg[:text]) }
     end
 
     if errors.present?
       aggregate_failures 'browser errrors' do
         errors.each do |error|
-          expect(error.level).to_not eq('SEVERE'), error.message
-          next unless error.level == 'WARNING'
+          expect(error[:type]).to_not eq('error'), error[:text]
+          next unless error[:type] == 'warning'
 
           warn 'WARN: browser warning'
-          warn error.message
+          warn error[:text]
         end
       end
     end

spec/support/capybara.rb

@@ -4,32 +4,16 @@ Capybara.server_host = 'localhost'
 Capybara.server_port = 3000
 Capybara.app_host = "http://#{Capybara.server_host}:#{Capybara.server_port}"
 
-require 'selenium/webdriver'
-
-def common_chrome_options
-  options = Selenium::WebDriver::Chrome::Options.new
-  options.add_argument '--window-size=1680,1050'
-  options.add_argument '--disable-search-engine-choice-screen'
-  options
+Capybara.register_driver(:playwright) do |app|
+  Capybara::Playwright::Driver.new(app)
 end
+Capybara.javascript_driver = :playwright
 
-Capybara.register_driver :chrome do |app|
-  Capybara::Selenium::Driver.new(app, browser: :chrome, options: common_chrome_options)
+if ENV['CI'].present?
+  # Reduce intermittent failures from slow CI runner environment
+  Capybara.default_max_wait_time = 2**3
 end
 
-Capybara.register_driver :headless_chrome do |app|
-  options = common_chrome_options
-  options.add_argument '--headless=new'
-
-  Capybara::Selenium::Driver.new(
-    app,
-    browser: :chrome,
-    options: options
-  )
-end
-
-Capybara.javascript_driver = :headless_chrome
-
 RSpec.configure do |config|
   config.before(:each, type: :system) do
     driven_by :rack_test