Merge pull request #1552 from amatsuda/warnings

Ruby warnings
teamcapybara · Jul 21, 2015 · 48954ab · 48954ab
2 parents dedd871 + 8f43c71
commit 48954ab
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/capybara.rb b/lib/capybara.rb
@@ -328,6 +328,7 @@ def session_pool
 
   self.default_driver = nil
   self.current_driver = nil
+  self.server_host = nil
 
   module Driver; end
   module RackTest; end

diff --git a/lib/capybara/queries/text_query.rb b/lib/capybara/queries/text_query.rb
@@ -3,7 +3,7 @@ module Capybara
   module Queries
     class TextQuery < BaseQuery
       def initialize(*args)
-        @type = args.shift if args.first.is_a?(Symbol) || args.first.nil?
+        @type = (args.first.is_a?(Symbol) || args.first.nil?) ? args.shift : nil
         @expected_text, @options = args
         unless @expected_text.is_a?(Regexp)
           @expected_text = Capybara::Helpers.normalize_whitespace(@expected_text)