From 8f5f55af895d67c4b58503050e8e782b265ad2b1 Mon Sep 17 00:00:00 2001
From: Thomas Walpole <twalpole@gmail.com>
Date: Sun, 28 May 2017 08:54:55 -0700
Subject: [PATCH] Fix Ruby warnings during tests

---
 lib/capybara/queries/base_query.rb         |  4 ++++
 lib/capybara/queries/current_path_query.rb |  1 +
 lib/capybara/queries/selector_query.rb     |  2 +-
 lib/capybara/queries/text_query.rb         |  2 +-
 lib/capybara/queries/title_query.rb        |  1 +
 lib/capybara/rack_test/driver.rb           |  1 +
 lib/capybara/rspec/matcher_proxies.rb      | 16 ++++++++++------
 lib/capybara/rspec/matchers.rb             |  1 +
 lib/capybara/selenium/driver.rb            |  1 +
 spec/minitest_spec_spec.rb                 |  8 ++++----
 spec/per_session_config_spec.rb            |  8 ++++----
 11 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/lib/capybara/queries/base_query.rb b/lib/capybara/queries/base_query.rb
index 1a1ed0f6..60d23000 100644
--- a/lib/capybara/queries/base_query.rb
+++ b/lib/capybara/queries/base_query.rb
@@ -8,6 +8,10 @@ module Capybara
       attr_reader :options
       attr_writer :session_options
 
+      def initialize(options)
+        @session_options = options.delete(:session_options)
+      end
+
       def session_options
         @session_options || Capybara.session_options
       end
diff --git a/lib/capybara/queries/current_path_query.rb b/lib/capybara/queries/current_path_query.rb
index edf971ff..9a999994 100644
--- a/lib/capybara/queries/current_path_query.rb
+++ b/lib/capybara/queries/current_path_query.rb
@@ -6,6 +6,7 @@ module Capybara
   module Queries
     class CurrentPathQuery < BaseQuery
       def initialize(expected_path, options = {})
+        super(options)
         @expected_path = expected_path
         @options = {
           url: false,
diff --git a/lib/capybara/queries/selector_query.rb b/lib/capybara/queries/selector_query.rb
index dae2a49a..f4b03f7e 100644
--- a/lib/capybara/queries/selector_query.rb
+++ b/lib/capybara/queries/selector_query.rb
@@ -9,7 +9,7 @@ module Capybara
 
       def initialize(*args, &filter_block)
         @options = if args.last.is_a?(Hash) then args.pop.dup else {} end
-        self.session_options = @options.delete(:session_options)
+        super(@options)
 
         @filter_block = filter_block
 
diff --git a/lib/capybara/queries/text_query.rb b/lib/capybara/queries/text_query.rb
index 7537a90d..36468ad4 100644
--- a/lib/capybara/queries/text_query.rb
+++ b/lib/capybara/queries/text_query.rb
@@ -7,7 +7,7 @@ module Capybara
         @type = (args.first.is_a?(Symbol) || args.first.nil?) ? args.shift : nil
         # @type = (Capybara.ignore_hidden_elements or Capybara.visible_text_only) ? :visible : :all if @type.nil?
         @options = if args.last.is_a?(Hash) then args.pop.dup else {} end
-        self.session_options = @options.delete(:session_options)
+        super(@options)
 
         @type = (session_options.ignore_hidden_elements or session_options.visible_text_only) ? :visible : :all if @type.nil?
 
diff --git a/lib/capybara/queries/title_query.rb b/lib/capybara/queries/title_query.rb
index f1bebdea..043ef84e 100644
--- a/lib/capybara/queries/title_query.rb
+++ b/lib/capybara/queries/title_query.rb
@@ -6,6 +6,7 @@ module Capybara
       def initialize(expected_title, options = {})
         @expected_title = expected_title
         @options = options
+        super(@options)
         unless @expected_title.is_a?(Regexp)
           @expected_title = Capybara::Helpers.normalize_whitespace(@expected_title)
         end
diff --git a/lib/capybara/rack_test/driver.rb b/lib/capybara/rack_test/driver.rb
index 21952ba7..013406ed 100644
--- a/lib/capybara/rack_test/driver.rb
+++ b/lib/capybara/rack_test/driver.rb
@@ -15,6 +15,7 @@ class Capybara::RackTest::Driver < Capybara::Driver::Base
 
   def initialize(app, options={})
     raise ArgumentError, "rack-test requires a rack application, but none was given" unless app
+    @session = nil
     @app = app
     @options = DEFAULT_OPTIONS.merge(options)
   end
diff --git a/lib/capybara/rspec/matcher_proxies.rb b/lib/capybara/rspec/matcher_proxies.rb
index a6233e12..110fe8ce 100644
--- a/lib/capybara/rspec/matcher_proxies.rb
+++ b/lib/capybara/rspec/matcher_proxies.rb
@@ -19,14 +19,18 @@ module Capybara
   end
 
   module DSL
-    def self.included(base)
-      warn "including Capybara::DSL in the global scope is not recommended!" if base == Object
+    class <<self
+      remove_method :included
 
-      if defined?(::RSpec::Matchers) && base.include?(::RSpec::Matchers)
-        base.send(:include, ::Capybara::RSpecMatcherProxies)
+      def included(base)
+        warn "including Capybara::DSL in the global scope is not recommended!" if base == Object
+
+        if defined?(::RSpec::Matchers) && base.include?(::RSpec::Matchers)
+          base.send(:include, ::Capybara::RSpecMatcherProxies)
+        end
+
+        super
       end
-
-      super
     end
   end
 end
diff --git a/lib/capybara/rspec/matchers.rb b/lib/capybara/rspec/matchers.rb
index f0a99d2e..f45acc36 100644
--- a/lib/capybara/rspec/matchers.rb
+++ b/lib/capybara/rspec/matchers.rb
@@ -44,6 +44,7 @@ module Capybara
       end
 
       def session_options
+        @context_el ||= nil
         @context_el ? @context_el.session_options : Capybara.session_options
       end
     end
diff --git a/lib/capybara/selenium/driver.rb b/lib/capybara/selenium/driver.rb
index b2513e44..75c791f0 100644
--- a/lib/capybara/selenium/driver.rb
+++ b/lib/capybara/selenium/driver.rb
@@ -37,6 +37,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
   end
 
   def initialize(app, options={})
+    @session = nil
     begin
       require 'selenium-webdriver'
       # Fix for selenium-webdriver 3.4.0 which misnamed these
diff --git a/spec/minitest_spec_spec.rb b/spec/minitest_spec_spec.rb
index a19b8090..3092677e 100644
--- a/spec/minitest_spec_spec.rb
+++ b/spec/minitest_spec_spec.rb
@@ -37,10 +37,10 @@ class MinitestSpecTest < Minitest::Spec
     page.must_have_xpath('.//input[@id="customer_email"]')
     page.wont_have_xpath('.//select[@id="not_form_title"]')
     page.wont_have_xpath('.//input[@id="customer_email"]') { |el| el[:id] == "not_customer_email" }
-    el = find(:select, 'form_title')
-    el.must_have_xpath('.//option[@class="title"]')
-    el.must_have_xpath('.//option', count: 1) { |el| el[:class] != 'title' && !el.disabled?}
-    el.wont_have_xpath('.//input[@id="customer_email"]')
+    select = find(:select, 'form_title')
+    select.must_have_xpath('.//option[@class="title"]')
+    select.must_have_xpath('.//option', count: 1) { |option| option[:class] != 'title' && !option.disabled?}
+    select.wont_have_xpath('.//input[@id="customer_email"]')
   end
 
   it "support css expectations" do
diff --git a/spec/per_session_config_spec.rb b/spec/per_session_config_spec.rb
index 1b97c6a0..fac17749 100644
--- a/spec/per_session_config_spec.rb
+++ b/spec/per_session_config_spec.rb
@@ -40,12 +40,12 @@ RSpec.describe Capybara::SessionConfig do
     it "doesn't allow session config when false" do
       Capybara.threadsafe = false
       session = Capybara::Session.new(:rack_test, TestApp)
-      expect { session.config.default_selector = :title }.to raise_error /Per session settings are only supported when Capybara.threadsafe == true/
+      expect { session.config.default_selector = :title }.to raise_error(/Per session settings are only supported when Capybara.threadsafe == true/)
       expect do
         session.configure do |config|
           config.exact = true
         end
-      end.to raise_error /Session configuration is only supported when Capybara.threadsafe == true/
+      end.to raise_error(/Session configuration is only supported when Capybara.threadsafe == true/)
     end
 
     it "uses the config from the session" do
@@ -60,8 +60,8 @@ RSpec.describe Capybara::SessionConfig do
     it "won't change threadsafe once a session is created" do
       Capybara.threadsafe = true
       Capybara.threadsafe = false
-      session = Capybara::Session.new(:rack_test, TestApp)
-      expect { Capybara.threadsafe = true }.to raise_error /Threadsafe setting cannot be changed once a session is created/
+      Capybara::Session.new(:rack_test, TestApp)
+      expect { Capybara.threadsafe = true }.to raise_error(/Threadsafe setting cannot be changed once a session is created/)
     end
   end
 end
\ No newline at end of file