diff --git a/packages/axe-core-capybara/lib/axe-capybara.rb b/packages/axe-core-capybara/lib/axe-capybara.rb index 66af8d6a..0ccdbdef 100644 --- a/packages/axe-core-capybara/lib/axe-capybara.rb +++ b/packages/axe-core-capybara/lib/axe-capybara.rb @@ -14,8 +14,7 @@ def self.configure(browser = :firefox) config = Axe::Configuration.instance - # provide a capybara webdriver page object - config.page = get_driver(browser) + config.page = set_driver(browser) # await and return yield config @@ -24,7 +23,14 @@ def self.configure(browser = :firefox) private - def self.get_driver(browserSymbol) - Capybara::Selenium::Driver.new(nil, browser: browserSymbol) + def self.set_driver(browserSymbol) + if browserSymbol == :chrome + Capybara.default_driver = :selenium_chrome + Capybara.javascript_driver = :selenium_chrome + else + Capybara.default_driver = :selenium + Capybara.javascript_driver = :selenium + end + Capybara::Selenium::Driver.new(nil, :browser => browserSymbol) end end diff --git a/packages/axe-core-capybara/spec/axe-capybara_spec.rb b/packages/axe-core-capybara/spec/axe-capybara_spec.rb index 35b6a681..840e217b 100644 --- a/packages/axe-core-capybara/spec/axe-capybara_spec.rb +++ b/packages/axe-core-capybara/spec/axe-capybara_spec.rb @@ -33,6 +33,7 @@ end is_chrome = driver.page.execute_script "return !!window.chrome" expect(is_chrome).to be true + expect(Capybara.default_driver).to be :selenium_chrome end it "defaults to firefox" do @@ -40,12 +41,14 @@ end browser = driver.page.options[:browser] expect(browser).to be :firefox + expect(Capybara.default_driver).to be :selenium end it "sets browser correctly" do driver = AxeCapybara.configure(:chrome) do end browser = driver.page.options[:browser] expect(browser).to be :chrome + expect(Capybara.default_driver).to be :selenium_chrome end it "should yield configuration with specified jslib path" do diff --git a/packages/axe-core-rspec/e2e/capybara/spec/a11y_spec.rb b/packages/axe-core-rspec/e2e/capybara/spec/a11y_spec.rb index d94252c8..0d751ad3 100644 --- a/packages/axe-core-rspec/e2e/capybara/spec/a11y_spec.rb +++ b/packages/axe-core-rspec/e2e/capybara/spec/a11y_spec.rb @@ -2,9 +2,9 @@ # Typical example using standard RSpec dsl describe "ABCD CompuTech (RSpec DSL)", - :type => :feature, :driver => :selenium do + :type => :feature do before :each do - visit "http://abcdcomputech.dequecloud.com/" + page.visit "http://abcdcomputech.dequecloud.com/" end it "is known to be inaccessible, should fail" do diff --git a/packages/axe-core-rspec/e2e/capybara/spec/spec_helper.rb b/packages/axe-core-rspec/e2e/capybara/spec/spec_helper.rb index 1bff9d71..0204d2a2 100644 --- a/packages/axe-core-rspec/e2e/capybara/spec/spec_helper.rb +++ b/packages/axe-core-rspec/e2e/capybara/spec/spec_helper.rb @@ -3,7 +3,7 @@ require "axe-rspec" require "axe-capybara" -@page = AxeCapybara.configure(:firefox) do |c| +AxeCapybara.configure(:chrome) do |c| end RSpec.configure do |config|