From 35f021e3b5150973f34375a24d11cc270d91bcd1 Mon Sep 17 00:00:00 2001 From: Thomas Walpole Date: Sat, 29 Apr 2017 09:58:03 -0700 Subject: [PATCH] access options via session --- lib/capybara/driver/base.rb | 4 ++-- lib/capybara/session.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/capybara/driver/base.rb b/lib/capybara/driver/base.rb index e30bfe64..4da36fff 100644 --- a/lib/capybara/driver/base.rb +++ b/lib/capybara/driver/base.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true class Capybara::Driver::Base - attr_writer :session_options + attr_writer :session def current_url raise NotImplementedError @@ -142,7 +142,7 @@ class Capybara::Driver::Base end def session_options - @session_options || Capybara.session_options + (@session && @session.config) || Capybara.session_options end # @deprecated This method is being removed diff --git a/lib/capybara/session.rb b/lib/capybara/session.rb index 6a6cb7db..db293bbd 100644 --- a/lib/capybara/session.rb +++ b/lib/capybara/session.rb @@ -99,7 +99,7 @@ module Capybara raise Capybara::DriverNotFoundError, "no driver called #{mode.inspect} was found, available drivers: #{other_drivers.join(', ')}" end driver = Capybara.drivers[mode].call(app) - driver.session_options = config + driver.session = self if driver.respond_to?(:session=) driver end end