selenium-webdriver 2.47.1 → 2.48.0

data/CHANGES

@@ -1,3 +1,21 @@
+2.48.0 (2015-10-07)
+===================
+
+Firefox:
+  * Initial implementation of Mozilla's Wires Driver for Marionette; Supported in version 43 and higher
+
+Edge:
+  * Fix execution with Remote Server
+  * Fix Javascript Execution
+  * Implement Alert Handling
+  * Implement Window Switching
+
+Ruby:
+  * Initial implementation of W3C WebDriver syntax to support Mozilla Wires
+  * Change to RSpec expect syntax
+  * Specs can be run from relative directories
+
+
 2.47.1 (2015-07-31)
 ===================
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    selenium-webdriver (2.47.1)
+    selenium-webdriver (2.48.0.dev)
       childprocess (~> 0.5)
       multi_json (~> 1.0)
       rubyzip (~> 1.0)

data/lib/selenium/client/base.rb

@@ -20,7 +20,7 @@
 module Selenium
   module Client
 
-		# Driver constructor and session management commands
+    # Driver constructor and session management commands
     module Base
       include Selenium::Client::Protocol
       include Selenium::Client::GeneratedDriver
@@ -133,7 +133,7 @@ module Selenium
       end
 
       def stop
-	      close_current_browser_session
+        close_current_browser_session
       end
 
       def chrome_backend?
@@ -143,7 +143,7 @@ module Selenium
       def javascript_extension=(new_javascript_extension)
         @extension_js = new_javascript_extension
       end
-	    alias :set_extension_js :javascript_extension=
+      alias :set_extension_js :javascript_extension=
 
     end
 

data/lib/selenium/client/extensions.rb

@@ -23,22 +23,19 @@ module Selenium
     # Convenience methods not explicitly part of the protocol
     module Extensions
 
-	    # These for all Ajax request to finish (Only works if you are using prototype, the wait happens in the browser)
-	    #
+      # These for all Ajax request to finish (Only works if you are using prototype, the wait happens in the browser)
       def wait_for_ajax(options={})
-		    builder = JavascriptExpressionBuilder.new active_javascript_framework(options)
-	      wait_for_condition builder.no_pending_ajax_requests.script,
-	                         options[:timeout_in_seconds]
+        builder = JavascriptExpressionBuilder.new active_javascript_framework(options)
+        wait_for_condition builder.no_pending_ajax_requests.script, options[:timeout_in_seconds]
       end
 
-	    # Wait for all Prototype effects to be processed (the wait happens in the browser).
-	    #
-	    # Credits to http://github.com/brynary/webrat/tree/master
-			def wait_for_effects(options={})
-		    builder = JavascriptExpressionBuilder.new active_javascript_framework(options)
-			  wait_for_condition builder.no_pending_effects.script,
-			                     options[:timeout_in_seconds]
-			end
+      # Wait for all Prototype effects to be processed (the wait happens in the browser).
+      #
+      # Credits to http://github.com/brynary/webrat/tree/master
+      def wait_for_effects(options={})
+        builder = JavascriptExpressionBuilder.new active_javascript_framework(options)
+        wait_for_condition builder.no_pending_effects.script, options[:timeout_in_seconds]
+      end
 
       # Wait for an element to be present (the wait happens in the browser).
       def wait_for_element(locator, options={})
@@ -54,8 +51,8 @@ module Selenium
         wait_for_condition builder.script, options[:timeout_in_seconds]
       end
 
-			# Wait for some text to be present (the wait is happening browser side).
-			#
+      # Wait for some text to be present (the wait is happening browser side).
+      #
       # wait_for_text will search for the given argument within the innerHTML
       # of the current DOM. Note that this method treats a single string
       # as a special case.
@@ -86,7 +83,7 @@ module Selenium
       #
       def wait_for_text(pattern, options={})
         builder = JavascriptExpressionBuilder.new
-		    builder.find_text(pattern, options).append("text_match == true;")
+        builder.find_text(pattern, options).append("text_match == true;")
         wait_for_condition builder.script, options[:timeout_in_seconds]
       end
 
@@ -95,7 +92,7 @@ module Selenium
       # See wait_for_text for usage details.
       def wait_for_no_text(pattern, options={})
         builder = JavascriptExpressionBuilder.new
-		    builder.find_text(pattern, options).append("text_match == false;")
+        builder.find_text(pattern, options).append("text_match == false;")
         wait_for_condition builder.script, options[:timeout_in_seconds]
       end
 
@@ -132,4 +129,4 @@ module Selenium
     end
 
   end
-end
+end

data/lib/selenium/client/idiomatic.rb

@@ -20,9 +20,9 @@
 module Selenium
   module Client
 
-		# Provide a more idiomatic API than the generated Ruby driver.
-		#
-		# Work in progress...
+    # Provide a more idiomatic API than the generated Ruby driver.
+    #
+    # Work in progress...
     module Idiomatic
 
       # Return the text content of an HTML element (rendered text shown to
@@ -102,31 +102,31 @@ module Selenium
       def wait_for(options)
         if options[:wait_for] == :page
           wait_for_page options[:timeout_in_seconds]
-	      elsif options[:wait_for] == :ajax
-	          wait_for_ajax options
-	      elsif options[:wait_for] == :element
-	          wait_for_element options[:element], options
-	      elsif options[:wait_for] == :no_element
-	          wait_for_no_element options[:element], options
-	      elsif options[:wait_for] == :text
-	          wait_for_text options[:text], options
-	      elsif options[:wait_for] == :no_text
+        elsif options[:wait_for] == :ajax
+          wait_for_ajax options
+        elsif options[:wait_for] == :element
+          wait_for_element options[:element], options
+        elsif options[:wait_for] == :no_element
+          wait_for_no_element options[:element], options
+        elsif options[:wait_for] == :text
+          wait_for_text options[:text], options
+        elsif options[:wait_for] == :no_text
           wait_for_no_text options[:text], options
-	      elsif options[:wait_for] == :effects
-	          wait_for_effects options
+        elsif options[:wait_for] == :effects
+          wait_for_effects options
         elsif options[:wait_for] == :popup
-            wait_for_popup options[:window], options[:timeout_in_seconds]
-            select_window options[:window] if options[:select]
+          wait_for_popup options[:window], options[:timeout_in_seconds]
+          select_window options[:window] if options[:select]
         elsif options[:wait_for] == :value
-            wait_for_field_value options[:element], options[:value], options
+          wait_for_field_value options[:element], options[:value], options
         elsif options[:wait_for] == :no_value
-            wait_for_no_field_value options[:element], options[:value], options
+          wait_for_no_field_value options[:element], options[:value], options
         elsif options[:wait_for] == :visible
-            wait_for_visible options[:element], options
+          wait_for_visible options[:element], options
         elsif options[:wait_for] == :not_visible
-            wait_for_not_visible options[:element], options
-	      elsif options[:wait_for] == :condition
-	          wait_for_condition options[:javascript], options[:timeout_in_seconds]
+          wait_for_not_visible options[:element], options
+        elsif options[:wait_for] == :condition
+          wait_for_condition options[:javascript], options[:timeout_in_seconds]
         end
       end
 
@@ -206,7 +206,7 @@ module Selenium
 
       # Alias for +field+
       def value(locator)
-	      field locator
+        field locator
       end
 
       # Returns whether a toggle-button (checkbox/radio) is checked.
@@ -397,7 +397,7 @@ module Selenium
       # the optionsString's format is "path=/path/, max_age=60, domain=.foo.com". The order of options are irrelevant, the unit      of the value of 'max_age' is second.  Note that specifying a domain that isn't a subset of the current domain will      usually fail.
       def create_cookie(name_value_pair, options="")
         if options.kind_of? Hash
-		      options = options.keys.collect {|key| "#{key}=#{options[key]}" }.sort.join(", ")
+          options = options.keys.collect {|key| "#{key}=#{options[key]}" }.sort.join(", ")
         end
         remote_control_command "createCookie", [name_value_pair,options,]
       end
@@ -417,8 +417,8 @@ module Selenium
       # 'optionsString' is options for the cookie. Currently supported options include 'path', 'domain'      and 'recurse.' The optionsString's format is "path=/path/, domain=.foo.com, recurse=true".      The order of options are irrelevant. Note that specifying a domain that isn't a subset of      the current domain will usually fail.
       def delete_cookie(name, options="")
         if options.kind_of? Hash
-		      ordered_keys = options.keys.sort {|a,b| a.to_s <=> b.to_s }
-		      options = ordered_keys.collect {|key| "#{key}=#{options[key]}" }.join(", ")
+          ordered_keys = options.keys.sort {|a,b| a.to_s <=> b.to_s }
+          options = ordered_keys.collect {|key| "#{key}=#{options[key]}" }.join(", ")
         end
         remote_control_command "deleteCookie", [name,options,]
       end

data/lib/selenium/client/javascript_expression_builder.rb

@@ -28,18 +28,18 @@ module Selenium
         @script = ""
       end
 
-	    def append(text)
-	      @script << text
-	      self
-	    end
+      def append(text)
+        @script << text
+        self
+      end
 
       def no_pending_ajax_requests
         append window_script("#{@framework.ajax_request_tracker} == 0")
       end
 
-			def no_pending_effects
-			  append window_script("Effect.Queue.size() == 0")
-			end
+      def no_pending_effects
+        append window_script("Effect.Queue.size() == 0")
+      end
 
       def visible(locator)
         append "selenium.isVisible('#{quote_escaped(locator)}')"
@@ -132,4 +132,4 @@ module Selenium
       end
     end
   end
-end
+end

data/lib/selenium/webdriver/common.rb

@@ -18,8 +18,8 @@
 # under the License.
 
 require 'selenium/webdriver/common/core_ext/dir'
-require 'selenium/webdriver/common/core_ext/string'
 require 'selenium/webdriver/common/core_ext/base64'
+require 'selenium/webdriver/common/w3c_error'
 require 'selenium/webdriver/common/error'
 require 'selenium/webdriver/common/platform'
 require 'selenium/webdriver/common/proxy'

data/lib/selenium/webdriver/common/driver.rb

@@ -47,7 +47,11 @@ module Selenium
 
           bridge = case browser
                    when :firefox, :ff
-                     Firefox::Bridge.new(opts)
+                     if Remote::W3CCapabilities.w3c?(opts)
+                       Firefox::W3CBridge.new(opts)
+                     else
+                       Firefox::Bridge.new(opts)
+                     end
                    when :remote
                      Remote::Bridge.new(opts)
                    when :ie, :internet_explorer

data/lib/selenium/webdriver/common/error.rb

@@ -206,18 +206,15 @@ module Selenium
         MoveTargetOutOfBoundsError      # 34
       ]
 
-      # aliased for backwards compatibility
-      ObsoleteElementError      = StaleElementReferenceError
-      UnhandledError            = UnknownError
-      UnexpectedJavascriptError = JavascriptError
-      NoAlertOpenError          = NoAlertPresentError
-      ElementNotDisplayedError  = ElementNotVisibleError
-
       class << self
         def for_code(code)
           return if [nil, 0].include? code
+          return Errors[code - 1] if code.is_a? Fixnum
 
-          Errors[code - 1] || WebDriverError
+          klass_name = code.split(' ').map(&:capitalize).join
+          Error.const_get("#{klass_name}Error")
+        rescue NameError
+          WebDriverError
         end
       end
 

data/lib/selenium/webdriver/common/search_context.rb

@@ -59,6 +59,9 @@ module Selenium
         end
 
         bridge.find_element_by by, what.to_s, ref
+      rescue Selenium::WebDriver::Error::TimeOutError
+        # Implicit Wait times out in Edge
+        raise Selenium::WebDriver::Error::NoSuchElementError
       end
 
       #
@@ -79,6 +82,9 @@ module Selenium
         end
 
         bridge.find_elements_by by, what.to_s, ref
+      rescue Selenium::WebDriver::Error::TimeOutError
+        # Implicit Wait times out in Edge
+        []
       end
 
       private

data/lib/selenium/webdriver/common/target_locator.rb

@@ -63,6 +63,10 @@ module Selenium
             nil
           end
 
+          unless @bridge.getWindowHandles.include? id
+            raise Error::NoSuchWindowError, "The specified identifier '#{id}' is not found in the window handle list"
+          end
+
           @bridge.switchToWindow id
 
           begin

data/lib/selenium/webdriver/common/w3c_error.rb

@@ -0,0 +1,194 @@
+# 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 Error
+
+      class WebDriverError < StandardError; end
+
+      #
+      # An attempt was made to select an element that cannot be selected.
+      #
+
+      class ElementNotSelectableError < WebDriverError; end
+
+      #
+      # An element command could not be completed because the element is
+      # not visible on the page.
+      #
+
+      class ElementNotVisibleError < WebDriverError; end
+
+      #
+      # The arguments passed to a command are either invalid or malformed.
+      #
+
+      class InvalidArgumentError < WebDriverError; end
+
+      #
+      # An illegal attempt was made to set a cookie under a different
+      # domain than the current page.
+      #
+
+      class InvalidCookieDomainError < WebDriverError; end
+
+      #
+      # The coordinates provided to an interactions operation are invalid.
+      #
+
+      class InvalidElementCoordinatesError < WebDriverError; end
+
+      #
+      # An element command could not be completed because the element is
+      # in an invalid state, e.g. attempting to click an element that is no
+      # longer attached to the document.
+      #
+
+      class InvalidElementStateError < WebDriverError; end
+
+      #
+      # Argument was an invalid selector.
+      #
+
+      class InvalidSelectorError < WebDriverError; end
+
+      #
+      # Occurs if the given session id is not in the list of active sessions,
+      # meaning the session either does not exist or that it’s not active.
+      #
+
+      class InvalidSessionIdError < WebDriverError; end
+
+      #
+      # An error occurred while executing JavaScript supplied by the user.
+      #
+
+      class JavascriptError < WebDriverError; end
+
+      #
+      # The target for mouse interaction is not in the browser’s viewport and
+      # cannot be brought into that viewport.
+      #
+
+      class MoveTargetOutOfBoundsError < WebDriverError; end
+
+      #
+      # An attempt was made to operate on a modal dialog when one was not open.
+      #
+
+      class NoSuchAlertError < WebDriverError; end
+
+      #
+      # An element could not be located on the page using the given
+      # search parameters.
+      #
+
+      class NoSuchElementError < WebDriverError; end
+
+      #
+      # A request to switch to a frame could not be satisfied because the
+      # frame could not be found.
+      #
+
+      class NoSuchFrameError < WebDriverError; end
+
+      #
+      # A request to switch to a window could not be satisfied because the
+      # window could not be found.
+      #
+
+      class NoSuchWindowError < WebDriverError; end
+
+      #
+      # A script did not complete before its timeout expired.
+      #
+
+      class ScriptTimeoutError < WebDriverError; end
+
+      #
+      # A new session could not be created.
+      #
+
+      class SessionNotCreatedError < WebDriverError; end
+
+      #
+      # An element command failed because the referenced element is no longer
+      # attached to the DOM.
+      #
+
+      class StaleElementReferenceError < WebDriverError; end
+
+      #
+      # An operation did not complete before its timeout expired.
+      #
+
+      class TimeoutError < WebDriverError; end
+
+      #
+      # A request to set a cookie’s value could not be satisfied.
+      #
+
+      class UnableToSetCookieError < WebDriverError; end
+
+      #
+      # A screen capture was made impossible.
+      #
+
+      class UnableToCaptureScreenError < WebDriverError; end
+
+      #
+      # A modal dialog was open, blocking this operation.
+      #
+
+      class UnexpectedAlertOpenError < WebDriverError; end
+
+      #
+      # An unknown error occurred in the remote end while processing
+      # the command.
+      #
+
+      class UnknownError < WebDriverError; end
+
+      #
+      # The requested command matched a known URL but did not match a
+      # method for that URL.
+      #
+
+      class UnknownMethodError < WebDriverError; end
+
+      #
+      # Indicates that a command that should have executed properly cannot be supported for some reason.
+      #
+
+      class UnsupportedOperationError < WebDriverError; end
+
+      # aliased for backwards compatibility
+      NoAlertPresentError       = NoSuchAlertError
+      ScriptTimeOutError        = ScriptTimeoutError
+      ObsoleteElementError      = StaleElementReferenceError
+      UnhandledError            = UnknownError
+      UnexpectedJavascriptError = JavascriptError
+      NoAlertOpenError          = NoAlertPresentError
+      ElementNotDisplayedError  = ElementNotVisibleError
+
+
+    end # Error
+  end # WebDriver
+end # Selenium