Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Brought capybara config up to date (#11461)

Damian Legawiec62c340cae1c2
diff --git a/core/lib/spree/testing_support/capybara_config.rb b/core/lib/spree/testing_support/capybara_config.rb
index 5de1a436c0..61e29bcb3b 100644
--- a/core/lib/spree/testing_support/capybara_config.rb
+++ b/core/lib/spree/testing_support/capybara_config.rb
@@ -1,28 +1,23 @@
require 'capybara-screenshot/rspec'
-Capybara.save_path = ENV['CIRCLE_ARTIFACTS'] if ENV['CIRCLE_ARTIFACTS']
+Capybara.configure do |config|
+ config.save_path = ENV['CIRCLE_ARTIFACTS'] if ENV['CIRCLE_ARTIFACTS']
+ config.server = :puma
+ config.default_driver = :rack_test
+ config.javascript_driver = :selenium_chrome_headless
+ config.default_max_wait_time = ENV.fetch('CAPYBARA_MAX_WAIT_TIME', 45).to_i
+ config.always_include_port = true
+ config.match = :smart
+ config.ignore_hidden_elements = true
+end
if ENV['WEBDRIVER'] == 'accessible'
require 'capybara/accessible'
Capybara.javascript_driver = :accessible
-else
- Capybara.register_driver :chrome do |app|
- Selenium::WebDriver.logger.level = :error
-
- Capybara::Selenium::Driver.new app,
- browser: :chrome,
- options: Selenium::WebDriver::Chrome::Options.new(
- args: %w[no-sandbox disable-dev-shm-usage disable-popup-blocking headless disable-gpu window-size=1920,1080 --enable-features=NetworkService,NetworkServiceInProcess --disable-features=VizDisplayCompositor],
- log_level: :error
- )
- end
- Capybara.javascript_driver = :chrome
+end
- Capybara::Screenshot.register_driver(:chrome) do |driver, path|
- driver.browser.save_screenshot(path)
+RSpec.configure do |config|
+ config.before(:each, js: true) do
+ Capybara.page.driver.browser.manage.window.resize_to(1400, 900)
end
end
-Capybara.default_max_wait_time = ENV.fetch('CAPYBARA_MAX_WAIT_TIME', 45).to_i
-Capybara.server = :puma
-
-Capybara.always_include_port = true
diff --git a/core/lib/spree/testing_support/capybara_ext.rb b/core/lib/spree/testing_support/capybara_ext.rb
index e2412efe7c..2769998ca2 100644
--- a/core/lib/spree/testing_support/capybara_ext.rb
+++ b/core/lib/spree/testing_support/capybara_ext.rb
@@ -59,15 +59,10 @@ def wait_for(options = {})
default_options = { error: nil, seconds: 5 }.merge(options)
Selenium::WebDriver::Wait.new(timeout: default_options[:seconds]).until { yield }
-rescue Selenium::WebDriver::Error::TimeOutError
+rescue Selenium::WebDriver::Error::TimeoutError
default_options[:error].nil? ? false : raise(default_options[:error])
end
-Capybara.configure do |config|
- config.match = :smart
- config.ignore_hidden_elements = true
-end
-
RSpec::Matchers.define :have_meta do |name, expected|
match do |_actual|
has_css?("meta[name='#{name}'][content='#{expected}']", visible: false)