selenium-webdriver 3.0.0.beta3.1 → 3.0.0.beta4.0

data/lib/selenium/webdriver/phantomjs/bridge.rb

@@ -26,28 +26,17 @@ module Selenium
 
       class Bridge < Remote::Bridge
         def initialize(opts = {})
-          http_client = opts.delete(:http_client)
-          caps        = opts.delete(:desired_capabilities) { Remote::Capabilities.phantomjs }
+          port = opts.delete(:port) || Service::DEFAULT_PORT
+          opts[:desired_capabilities] ||= Remote::Capabilities.phantomjs
 
-          if opts.key?(:url)
-            url = opts.delete(:url)
-          else
-            args = opts.delete(:args) || caps['phantomjs.cli.args']
-
-            @service = Service.new(PhantomJS.path, Service::DEFAULT_PORT, *args)
+          unless opts.key?(:url)
+            args = opts.delete(:args) || opts[:desired_capabilities]['phantomjs.cli.args']
+            @service = Service.new(PhantomJS.path, port, *args)
             @service.start
-
-            url = @service.uri
+            opts[:url] = @service.uri
           end
 
-          remote_opts = {
-            url: url,
-            desired_capabilities: caps
-          }
-
-          remote_opts[:http_client] = http_client if http_client
-
-          super(remote_opts)
+          super(opts)
         end
 
         def browser

data/lib/selenium/webdriver/remote/bridge.rb

@@ -62,9 +62,10 @@ module Selenium
         def initialize(opts = {})
           opts = opts.dup
 
+          port = opts.delete(:port) || 4444
           http_client = opts.delete(:http_client) { Http::Default.new }
           desired_capabilities = opts.delete(:desired_capabilities) { Capabilities.firefox }
-          url = opts.delete(:url) { "http://#{Platform.localhost}:4444/wd/hub" }
+          url = opts.delete(:url) { "http://#{Platform.localhost}:#{port}/wd/hub" }
 
           unless opts.empty?
             raise ArgumentError, "unknown option#{'s' if opts.size != 1}: #{opts.inspect}"

data/lib/selenium/webdriver/remote/capabilities.rb

@@ -63,9 +63,7 @@ module Selenium
             new({
               browser_name: 'chrome',
               javascript_enabled: true,
-              css_selectors_enabled: true,
-              loggingPrefs: {browser: 'ALL',
-                             driver: 'ALL'}
+              css_selectors_enabled: true
             }.merge(opts))
           end
 

data/lib/selenium/webdriver/remote/w3c_bridge.rb

@@ -67,9 +67,10 @@ module Selenium
 
           opts = opts.dup
 
+          port = opts.delete(:port) || 4444
           http_client = opts.delete(:http_client) { Http::Default.new }
           desired_capabilities = opts.delete(:desired_capabilities) { W3CCapabilities.firefox }
-          url = opts.delete(:url) { "http://#{Platform.localhost}:4444/wd/hub" }
+          url = opts.delete(:url) { "http://#{Platform.localhost}:#{port}/wd/hub" }
 
           desired_capabilities = W3CCapabilities.send(desired_capabilities) if desired_capabilities.is_a? Symbol
 

data/lib/selenium/webdriver/safari.rb

@@ -24,9 +24,8 @@ module Selenium
   module WebDriver
     module Safari
       MISSING_TEXT = <<-ERROR.tr("\n", '').freeze
-        Unable to find safari extension. Please download the file from
-        http://www.seleniumhq.org/download/ and place it
-        somewhere on your PATH. More info at https://github.com/SeleniumHQ/selenium/wiki/SafariDriver.
+        Unable to find Apple's safaridriver which comes with Safari 10.
+        More info at https://webkit.org/blog/6900/webdriver-support-in-safari-10/
       ERROR
 
       class << self
@@ -36,22 +35,10 @@ module Selenium
         end
 
         def path
-          @path ||= (
-            path = case Platform.os
-                   when :windows
-                     Platform.find_in_program_files('Safari\\Safari.exe')
-                   when :macosx
-                     '/Applications/Safari.app/Contents/MacOS/Safari'
-                   else
-                     Platform.find_binary('Safari')
-                   end
-
-            unless File.file?(path) && File.executable?(path)
-              raise Error::WebDriverError, MISSING_TEXT
-            end
-
-            path
-          )
+          @path ||= '/Applications/Safari.app/Contents/MacOS/Safari'
+          return @path if File.file?(@path) && File.executable?(@path)
+          raise Error::WebDriverError, 'Safari is only supported on Mac' unless Platform.os == :macosx
+          raise Error::WebDriverError, 'Unable to find Safari'
         end
 
         def resource_path
@@ -64,18 +51,14 @@ module Selenium
         end
 
         def driver_path
-          @driver_path || '/usr/bin/safaridriver'
+          @driver_path ||= '/usr/bin/safaridriver'
+          return @driver_path if File.file?(@driver_path) && File.executable?(@driver_path)
+          raise Error::WebDriverError, MISSING_TEXT
         end
       end
     end # Safari
   end # WebDriver
 end # Selenium
 
-require 'selenium/webdriver/safari/browser'
-require 'selenium/webdriver/safari/server'
-require 'selenium/webdriver/safari/options'
-require 'selenium/webdriver/safari/legacy_bridge'
-require 'selenium/webdriver/safari/apple_bridge'
+require 'selenium/webdriver/safari/bridge'
 require 'selenium/webdriver/safari/service'
-
-Selenium::WebDriver::Safari::Bridge = Selenium::WebDriver::Safari::LegacyBridge

data/lib/selenium/webdriver/safari/{apple_bridge.rb → bridge.rb}

@@ -21,16 +21,17 @@ module Selenium
   module WebDriver
     module Safari
       # @api private
-      class AppleBridge < Remote::Bridge
+      class Bridge < Remote::Bridge
         def initialize(opts = {})
           opts[:desired_capabilities] ||= Remote::Capabilities.safari
+          port = opts.delete(:port) || Service::DEFAULT_PORT
+          service_args = opts.delete(:service_args) || {}
 
-          @service = Service.new(Safari.driver_path, Service::DEFAULT_PORT, *extract_service_args(opts))
+          @service = Service.new(Safari.driver_path, port, *extract_service_args(service_args))
           @service.start
-
           opts[:url] = @service.uri
 
-          super
+          super(opts)
         end
 
         def quit
@@ -41,11 +42,10 @@ module Selenium
 
         private
 
-        def extract_service_args(opts)
-          service_log_path = opts.delete(:service_log_path)
-          service_log_path ? ["--log-path=#{service_log_path}"] : []
+        def extract_service_args(args = {})
+          args.key?(:port) ? ["--port=#{args[:port]}"] : []
         end
-      end # AppleBridge
+      end # Bridge
     end # Safari
   end # WebDriver
 end # Selenium

data/selenium-webdriver.gemspec

@@ -5,7 +5,7 @@ raise "cwd must be #{root} when reading gemspec" if root != Dir.pwd
 
 Gem::Specification.new do |s|
   s.name = 'selenium-webdriver'
-  s.version = '3.0.0.beta3.1'
+  s.version = '3.0.0.beta4.0'
 
   s.authors = ['Alex Rodionov', 'Titus Fortner']
   s.email = ['p0deje@gmail.com', 'titusfortner@gmail.com']

metadata

@@ -2,7 +2,7 @@
 name: selenium-webdriver
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 3.0.0.beta3.1
+  version: 3.0.0.beta4.0
 platform: ruby
 authors: 
   - Alex Rodionov
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2016-09-03 00:00:00 -05:00
+date: 2016-10-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -219,13 +219,8 @@ 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/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/bridge.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

data/lib/selenium/webdriver/safari/browser.rb

@@ -1,38 +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.
-
-module Selenium
-  module WebDriver
-    module Safari
-      class Browser
-        def start(*args)
-          Platform.exit_hook { stop } # make sure we don't leave the browser running
-
-          @process = ChildProcess.new(Safari.path, *args)
-          @process.io.inherit! if $DEBUG
-          @process.start
-        end
-
-        def stop
-          @process.stop if @process
-        end
-      end # Browser
-    end # Safari
-  end # WebDriver
-end # Selenium

data/lib/selenium/webdriver/safari/legacy_bridge.rb

@@ -1,138 +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.
-
-module Selenium
-  module WebDriver
-    module Safari
-      # @api private
-      class LegacyBridge < Remote::Bridge
-        COMMAND_TIMEOUT = 60
-
-        def self.legacy?
-          !File.exist?(Safari.driver_path)
-        end
-
-        def initialize(opts = {})
-          command_timeout = Integer(opts[:timeout] || COMMAND_TIMEOUT)
-          safari_options  = opts.delete(:options) || Safari::Options.new(opts)
-          capabilities    = merge_capabilities(opts, safari_options)
-
-          @command_id ||= 0
-
-          # TODO: handle safari_opts['cleanSession']
-          @server = Server.new(safari_options.port, command_timeout)
-          @server.start
-
-          @safari = Browser.new
-          @safari.start(prepare_connect_file)
-
-          @server.wait_for_connection
-
-          super(desired_capabilities: capabilities)
-        end
-
-        def quit
-          super
-
-          @server.stop
-          @safari.stop
-        end
-
-        def driver_extensions
-          [
-            DriverExtensions::TakesScreenshot,
-            DriverExtensions::HasInputDevices
-          ]
-        end
-
-        private
-
-        def create_session(desired_capabilities)
-          resp = raw_execute :newSession, {}, {desiredCapabilities: desired_capabilities}
-          Remote::Capabilities.json_create resp.fetch('value')
-        end
-
-        def raw_execute(command, opts = {}, command_hash = nil)
-          @command_id += 1
-
-          params = {}
-          opts.each do |key, value|
-            params[camel_case(key.to_s)] = value
-          end
-
-          params.merge!(command_hash) if command_hash
-
-          @server.send(
-            origin: 'webdriver',
-            type: 'command',
-            command: {id: @command_id.to_s, name: command, parameters: params}
-          )
-
-          raw = @server.receive
-          response = raw.fetch('response')
-
-          status_code = response['status']
-          if status_code != 0
-            raise Error.for_code(status_code), response['value']['message']
-          end
-
-          if raw['id'].to_s != @command_id.to_s
-            raise Error::WebDriverError, "response id does not match command id: #{raw['id']} != #{@command_id}"
-          end
-
-          response
-        end
-
-        def camel_case(str)
-          parts = str.split('_')
-          parts[1..-1].map(&:capitalize!)
-
-          parts.join
-        end
-
-        def prepare_connect_file
-          # TODO: use tempfile?
-          path = File.join(Dir.tmpdir, "safaridriver-#{Time.now.usec}.html")
-
-          File.open(path, 'w') do |io|
-            io << "<!DOCTYPE html><script>window.location = '#{@server.uri}';</script>"
-          end
-
-          FileReaper << path
-          path.tr! '/', '\\' if Platform.windows?
-
-          path
-        end
-
-        def merge_capabilities(opts, safari_options)
-          caps  = safari_options.to_capabilities
-          other = opts[:desired_capabilities]
-
-          if other
-            other = opts[:desired_capabilities].as_json
-            caps['safari.options'].merge!(other.delete('safari.options') || {})
-            caps.merge!(other)
-          end
-
-          caps
-        end
-      end # Bridge
-    end # Safari
-  end # WebDriver
-end # Selenium

data/lib/selenium/webdriver/safari/options.rb

@@ -1,61 +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.
-
-module Selenium
-  module WebDriver
-    module Safari
-      class Options
-        DEFAULT_PORT = 56485
-
-        attr_accessor :port, :data_dir, :skip_extension_installation
-
-        def initialize(opts = {})
-          extract_options(opts)
-        end
-
-        def clean_session?
-          @clean_session == true
-        end
-
-        def to_capabilities
-          caps = Remote::Capabilities.safari
-          caps['safari.options'] = as_json
-
-          caps
-        end
-
-        def as_json
-          {
-            'port'         => port,
-            'dataDir'      => data_dir,
-            'cleanSession' => clean_session?
-          }
-        end
-
-        private
-
-        def extract_options(opts)
-          @port          = Integer(opts[:port] || DEFAULT_PORT)
-          @data_dir      = opts[:custom_data_dir] || opts[:data_dir]
-          @clean_session = opts[:clean_session]
-        end
-      end # Options
-    end # Safari
-  end # WebDriver
-end # Selenium