selenium-webdriver 2.53.4 → 3.0.0.beta1

data/lib/selenium/webdriver/support/select.rb

@@ -21,7 +21,6 @@ module Selenium
   module WebDriver
     module Support
       class Select
-
         #
         # @param [Element] element The select element to use
         #
@@ -29,12 +28,12 @@ module Selenium
         def initialize(element)
           tag_name = element.tag_name
 
-          unless tag_name.downcase == "select"
+          unless tag_name.casecmp('select').zero?
             raise ArgumentError, "unexpected tag name #{tag_name.inspect}"
           end
 
           @element = element
-          @multi   = ![nil, "false"].include?(element.attribute(:multiple))
+          @multi = ![nil, 'false'].include?(element.attribute(:multiple))
         end
 
         #
@@ -54,7 +53,7 @@ module Selenium
         #
 
         def options
-          @element.find_elements :tag_name, 'option'
+          @element.find_elements tag_name: 'option'
         end
 
         #
@@ -64,7 +63,7 @@ module Selenium
         #
 
         def selected_options
-          options.select { |e| e.selected? }
+          options.select(&:selected?)
         end
 
         #
@@ -75,8 +74,9 @@ module Selenium
         #
 
         def first_selected_option
-          option = options.find { |e| e.selected? }
-          option or raise Error::NoSuchElementError, 'no options are selected'
+          option = options.find(&:selected?)
+          return option if option
+          raise Error::NoSuchElementError, 'no options are selected'
         end
 
         #
@@ -168,31 +168,22 @@ module Selenium
         def select_by_text(text)
           opts = find_by_text text
 
-          if opts.empty?
-            raise Error::NoSuchElementError, "cannot locate element with text: #{text.inspect}"
-          end
-
-          select_options opts
+          return select_options(opts) unless opts.empty?
+          raise Error::NoSuchElementError, "cannot locate element with text: #{text.inspect}"
         end
 
         def select_by_index(index)
           opts = find_by_index index
 
-          if opts.empty?
-            raise Error::NoSuchElementError, "cannot locate element with index: #{index.inspect}"
-          end
-
-          select_option opts.first
+          return select_option(opts.first) unless opts.empty?
+          raise Error::NoSuchElementError, "cannot locate element with index: #{index.inspect}"
         end
 
         def select_by_value(value)
           opts = find_by_value value
 
-          if opts.empty?
-            raise Error::NoSuchElementError, "cannot locate option with value: #{value.inspect}"
-          end
-
-          select_options opts
+          return select_options(opts) unless opts.empty?
+          raise Error::NoSuchElementError, "cannot locate option with value: #{value.inspect}"
         end
 
         def deselect_by_text(text)
@@ -201,11 +192,8 @@ module Selenium
           end
           opts = find_by_text text
 
-          if opts.empty?
-            raise Error::NoSuchElementError, "cannot locate element with text: #{text.inspect}"
-          end
-
-          deselect_options opts
+          return deselect_options(opts) unless opts.empty?
+          raise Error::NoSuchElementError, "cannot locate element with text: #{text.inspect}"
         end
 
         def deselect_by_value(value)
@@ -214,11 +202,8 @@ module Selenium
           end
           opts = find_by_value value
 
-          if opts.empty?
-            raise Error::NoSuchElementError, "cannot locate option with value: #{value.inspect}"
-          end
-
-          deselect_options opts
+          return deselect_options(opts) unless opts.empty?
+          raise Error::NoSuchElementError, "cannot locate option with value: #{value.inspect}"
         end
 
         def deselect_by_index(index)
@@ -227,15 +212,10 @@ module Selenium
           end
           opts = find_by_index index
 
-          if opts.empty?
-            raise Error::NoSuchElementError, "cannot locate option with index: #{index}"
-          end
-
-          deselect_option opts.first
+          return deselect_option(opts.first) unless opts.empty?
+          raise Error::NoSuchElementError, "cannot locate option with index: #{index}"
         end
 
-        private
-
         def select_option(option)
           option.click unless option.selected?
         end
@@ -262,60 +242,29 @@ module Selenium
 
         def find_by_text(text)
           xpath = ".//option[normalize-space(.) = #{Escaper.escape text}]"
-          opts = @element.find_elements(:xpath, xpath)
-
-          if opts.empty? && text =~ /\s+/
-            longest_word = text.split(/\s+/).max_by { |item| item.length }
-
-            if longest_word.empty?
-              candidates = options
-            else
-              xpath = ".//option[contains(., #{Escaper.escape longest_word})]"
-              candidates = @element.find_elements(:xpath, xpath)
-            end
-
-            if multiple?
-              candidates.select { |option| text == option.text }
-            else
-              Array(candidates.find { |option| text == option.text })
-            end
+          opts = @element.find_elements(xpath: xpath)
+
+          return opts unless opts.empty? && text =~ /\s+/
+
+          longest_word = text.split(/\s+/).max_by(&:length)
+          if longest_word.empty?
+            candidates = options
           else
-            opts
+            xpath = ".//option[contains(., #{Escaper.escape longest_word})]"
+            candidates = @element.find_elements(xpath: xpath)
           end
+
+          return Array(candidates.find { |option| text == option.text }) unless multiple?
+          candidates.select { |option| text == option.text }
         end
 
         def find_by_index(index)
-          index = index.to_s
-          options.select { |option| option.attribute(:index) == index }
+          options.select { |option| option.attribute(:index) == index.to_s }
         end
 
         def find_by_value(value)
-          @element.find_elements(:xpath, ".//option[@value = #{Escaper.escape value}]")
+          @element.find_elements(xpath: ".//option[@value = #{Escaper.escape value}]")
         end
-
-        #
-        # @api private
-        #
-
-        module Escaper
-          def self.escape(str)
-            if str.include?('"') && str.include?("'")
-              parts = str.split('"', -1).map { |part| %{"#{part}"} }
-
-              quoted = parts.join(%{, '"', }).
-                             gsub(/^"", |, ""$/, '')
-
-              "concat(#{quoted})"
-            elsif str.include?('"')
-              # escape string with just a quote into being single quoted: f"oo -> 'f"oo'
-              "'#{str}'"
-            else
-              # otherwise return the quoted string
-              %{"#{str}"}
-            end
-          end
-
-        end # Escaper
       end # Select
     end # Support
   end # WebDriver

data/selenium-webdriver.gemspec

@@ -1,34 +1,34 @@
 # -*- encoding: utf-8 -*-
 
 root = File.expand_path(File.dirname(__FILE__))
-if root != Dir.pwd
-  raise "cwd must be #{root} when reading gemspec"
-end
+raise "cwd must be #{root} when reading gemspec" if root != Dir.pwd
 
 Gem::Specification.new do |s|
-  s.name    = "selenium-webdriver"
-  s.version = "2.53.4"
+  s.name = 'selenium-webdriver'
+  s.version = '3.0.0.beta1'
 
-  s.authors     = ["Jari Bakken"]
-  s.email       = "jari.bakken@gmail.com"
-  s.description = "WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application."
-  s.summary     = "The next generation developer focused tool for automated testing of webapps"
-  s.homepage    = "https://github.com/seleniumhq/selenium"
-  s.licenses    = ["Apache"]
+  s.authors = ['Alex Rodionov', 'Titus Fortner']
+  s.email = ['p0deje@gmail.com', 'titusfortner@gmail.com']
+  s.description = 'WebDriver is a tool for writing automated tests of websites.
+It aims to mimic the behaviour of a real user, and as such interacts with the
+HTML of the application.'
+  s.summary = 'The next generation developer focused tool for automated testing of webapps'
+  s.homepage = 'https://github.com/seleniumhq/selenium'
+  s.licenses = ['Apache']
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.required_ruby_version     = Gem::Requirement.new(">= 1.9.2")
+  s.required_rubygems_version = Gem::Requirement.new('> 1.3.1') if s.respond_to? :required_rubygems_version=
+  s.required_ruby_version = Gem::Requirement.new('>= 2.0')
 
-  s.files         = Dir[root + '/**/*'].reject { |e| e =~ /ruby\.iml|build\.desc/ }.map { |e| e.sub(root + '/', '') }
-  s.require_paths = ["lib"]
+  s.files = Dir[root + '/**/*'].reject { |e| e =~ /ruby\.iml|build\.desc/ }.map { |e| e.sub(root + '/', '') }
+  s.require_paths = ['lib']
 
-  s.add_runtime_dependency "rubyzip", ["~> 1.0"]
-  s.add_runtime_dependency "childprocess", ["~> 0.5"]
-  s.add_runtime_dependency "websocket", ["~> 1.0"]
+  s.add_runtime_dependency 'rubyzip', ['~> 1.0']
+  s.add_runtime_dependency 'childprocess', ['~> 0.5']
+  s.add_runtime_dependency 'websocket', ['~> 1.0']
 
-  s.add_development_dependency "rspec", ["~> 2.99.0"]
-  s.add_development_dependency "rack", ["~> 1.0"]
-  s.add_development_dependency "ci_reporter", ["~> 1.6", ">= 1.6.2"]
-  s.add_development_dependency "webmock", ["~> 1.7", ">= 1.7.5"]
-  s.add_development_dependency "yard", ["~> 0.8.7"]
+  s.add_development_dependency 'rspec', ['~> 2.99.0']
+  s.add_development_dependency 'rack', ['~> 1.0']
+  s.add_development_dependency 'ci_reporter', ['~> 1.6', '>= 1.6.2']
+  s.add_development_dependency 'webmock', ['~> 1.7', '>= 1.7.5']
+  s.add_development_dependency 'yard', ['~> 0.8.7']
 end

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification 
 name: selenium-webdriver
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 2.53.4
+  prerelease: 6
+  version: 3.0.0.beta1
 platform: ruby
 authors: 
-  - Jari Bakken
+  - Alex Rodionov
+  - Titus Fortner
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2016-06-28 00:00:00 -05:00
+date: 2016-07-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -107,8 +108,13 @@ dependencies:
             version: 0.8.7
     type: :development
     version_requirements: *id008
-description: WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.
-email: jari.bakken@gmail.com
+description: |-
+  WebDriver is a tool for writing automated tests of websites.
+  It aims to mimic the behaviour of a real user, and as such interacts with the
+  HTML of the application.
+email: 
+  - p0deje@gmail.com
+  - titusfortner@gmail.com
 executables: []
 
 extensions: []
@@ -121,35 +127,18 @@ files:
   - LICENSE
   - README.md
   - selenium-webdriver.gemspec
-  - lib/selenium-client.rb
   - lib/selenium-webdriver.rb
-  - lib/selenium/client.rb
   - lib/selenium/server.rb
   - lib/selenium/webdriver.rb
-  - lib/selenium/client/base.rb
-  - lib/selenium/client/driver.rb
-  - lib/selenium/client/errors.rb
-  - lib/selenium/client/extensions.rb
-  - lib/selenium/client/idiomatic.rb
-  - lib/selenium/client/javascript_expression_builder.rb
-  - lib/selenium/client/legacy_driver.rb
-  - lib/selenium/client/protocol.rb
-  - lib/selenium/client/selenium_helper.rb
-  - lib/selenium/client/javascript_frameworks/jquery.rb
-  - lib/selenium/client/javascript_frameworks/prototype.rb
-  - lib/selenium/rake/server_task.rb
-  - lib/selenium/webdriver/android.rb
   - lib/selenium/webdriver/chrome.rb
   - lib/selenium/webdriver/common.rb
   - lib/selenium/webdriver/edge.rb
   - lib/selenium/webdriver/firefox.rb
   - lib/selenium/webdriver/ie.rb
-  - lib/selenium/webdriver/iphone.rb
   - lib/selenium/webdriver/phantomjs.rb
   - lib/selenium/webdriver/remote.rb
   - lib/selenium/webdriver/safari.rb
   - lib/selenium/webdriver/support.rb
-  - lib/selenium/webdriver/android/bridge.rb
   - lib/selenium/webdriver/chrome/bridge.rb
   - lib/selenium/webdriver/chrome/profile.rb
   - lib/selenium/webdriver/chrome/service.rb
@@ -172,6 +161,7 @@ files:
   - lib/selenium/webdriver/common/profile_helper.rb
   - lib/selenium/webdriver/common/proxy.rb
   - lib/selenium/webdriver/common/search_context.rb
+  - lib/selenium/webdriver/common/service.rb
   - lib/selenium/webdriver/common/socket_lock.rb
   - lib/selenium/webdriver/common/socket_poller.rb
   - lib/selenium/webdriver/common/target_locator.rb
@@ -182,8 +172,6 @@ files:
   - lib/selenium/webdriver/common/wait.rb
   - lib/selenium/webdriver/common/window.rb
   - lib/selenium/webdriver/common/zipper.rb
-  - lib/selenium/webdriver/common/core_ext/base64.rb
-  - lib/selenium/webdriver/common/core_ext/dir.rb
   - lib/selenium/webdriver/common/driver_extensions/has_input_devices.rb
   - lib/selenium/webdriver/common/driver_extensions/has_location.rb
   - lib/selenium/webdriver/common/driver_extensions/has_network_connection.rb
@@ -195,7 +183,6 @@ files:
   - lib/selenium/webdriver/common/driver_extensions/takes_screenshot.rb
   - lib/selenium/webdriver/common/driver_extensions/uploads_files.rb
   - lib/selenium/webdriver/common/html5/local_storage.rb
-  - lib/selenium/webdriver/common/html5/location.rb
   - lib/selenium/webdriver/common/html5/session_storage.rb
   - lib/selenium/webdriver/common/html5/shared_web_storage.rb
   - lib/selenium/webdriver/edge/bridge.rb
@@ -215,8 +202,7 @@ files:
   - lib/selenium/webdriver/firefox/native/linux/amd64/x_ignore_nofocus.so
   - lib/selenium/webdriver/firefox/native/linux/x86/x_ignore_nofocus.so
   - lib/selenium/webdriver/ie/bridge.rb
-  - lib/selenium/webdriver/ie/server.rb
-  - lib/selenium/webdriver/iphone/bridge.rb
+  - lib/selenium/webdriver/ie/service.rb
   - lib/selenium/webdriver/phantomjs/bridge.rb
   - lib/selenium/webdriver/phantomjs/service.rb
   - lib/selenium/webdriver/remote/bridge.rb
@@ -231,14 +217,17 @@ files:
   - lib/selenium/webdriver/remote/http/curb.rb
   - lib/selenium/webdriver/remote/http/default.rb
   - lib/selenium/webdriver/remote/http/persistent.rb
-  - lib/selenium/webdriver/safari/bridge.rb
+  - lib/selenium/webdriver/safari/apple_bridge.rb
   - lib/selenium/webdriver/safari/browser.rb
+  - lib/selenium/webdriver/safari/legacy_bridge.rb
   - lib/selenium/webdriver/safari/options.rb
   - lib/selenium/webdriver/safari/server.rb
+  - lib/selenium/webdriver/safari/service.rb
   - lib/selenium/webdriver/safari/resources/client.js
   - lib/selenium/webdriver/support/abstract_event_listener.rb
   - lib/selenium/webdriver/support/block_event_listener.rb
   - lib/selenium/webdriver/support/color.rb
+  - lib/selenium/webdriver/support/escaper.rb
   - lib/selenium/webdriver/support/event_firing_bridge.rb
   - lib/selenium/webdriver/support/select.rb
 has_rdoc: true
@@ -255,7 +244,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.9.2
+        version: "2.0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 

data/lib/selenium-client.rb

@@ -1,21 +0,0 @@
-# encoding: utf-8
-#
-# Licensed to the Software Freedom Conservancy (SFC) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The SFC licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-require 'selenium/client'
-

data/lib/selenium/client.rb

@@ -1,57 +0,0 @@
-# encoding: utf-8
-#
-# Licensed to the Software Freedom Conservancy (SFC) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The SFC licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-require 'net/http'
-require 'uri'
-require 'cgi'
-require 'digest/md5'
-require 'base64'
-require 'fileutils'
-require 'tmpdir'
-
-require 'selenium/client/errors'
-require 'selenium/client/protocol'
-require 'selenium/client/legacy_driver'
-require 'selenium/client/javascript_expression_builder'
-require 'selenium/client/javascript_frameworks/prototype'
-require 'selenium/client/javascript_frameworks/jquery'
-require 'selenium/client/extensions'
-require 'selenium/client/idiomatic'
-require 'selenium/client/base'
-require 'selenium/client/driver'
-require 'selenium/client/selenium_helper'
-require 'selenium/server'
-
-module Selenium
-  DEPRECATED_CONSTANTS = {
-    :SeleniumDriver => Selenium::Client::Driver,
-    :CommandError   => Selenium::Client::CommandError
-  }
-
-  def self.const_missing(name)
-    if replacement = DEPRECATED_CONSTANTS[name.to_sym]
-      warn "the Selenium::#{name} constant has been deprecated, please use #{replacement} instead"
-      replacement
-    else
-      super
-    end
-  end
-
-  autoload :Rake, 'selenium/rake/server_task'
-end # Selenium