selenium-webdriver 0.0.17 → 0.0.18

data/chrome/src/extension/manifest-nonwin.json

@@ -1,6 +1,6 @@
 {
   "name": "WebDriver",
-  "version": "1.9.10",
+  "version": "1.9.11",
   "description": "WebDriver extension for Chrome",
   "browser_action": {
     "default_title": "WebDriver",

data/chrome/src/extension/manifest-win.json

@@ -1,6 +1,6 @@
 {
   "name": "WebDriver",
-  "version": "1.9.10  ",
+  "version": "1.9.11",
   "description": "WebDriver extension for Chrome",
   "browser_action": {
     "default_title": "WebDriver",

data/chrome/src/extension/utils.js

@@ -187,8 +187,8 @@ Utils.fireHtmlEvent = function(element, eventName, callback) {
       callback = function() {};
     }
     var args = [
-      {type: "ELEMENT", value: addElementToInternalArray(element)},
-      {type: "STRING", value: eventName}
+      {"ELEMENT": addElementToInternalArray(element)},
+      eventName
     ];
 
     // We need to do this because event handlers refer to functions that
@@ -208,10 +208,10 @@ Utils.fireMouseEventOn = function(element, eventName) {
 
 Utils.triggerMouseEvent = function(element, eventType, clientX, clientY) {
     var args = [
-      {type: "ELEMENT", value: addElementToInternalArray(element)},
-      {type: "STRING", value: eventType},
-      {type: "NUMBER", value: clientX},
-      {type: "NUMBER", value: clientY}
+      {"ELEMENT": addElementToInternalArray(element)},
+      eventType,
+      clientX,
+      clientY
     ];
 
     // We need to do this because event handlers refer to functions that
@@ -227,5 +227,5 @@ Utils.triggerMouseEvent = function(element, eventType, clientX, clientY) {
 };
 
 Utils.trim = function(str) {
-  return str.replace(/^\s*/, "").replace(/\s*$/, "");
-}
+    return str.replace(/^\s*/, "").replace(/\s*$/, "");
+};

data/chrome/src/rb/lib/selenium/webdriver/chrome.rb

@@ -6,3 +6,12 @@ require "fileutils"
 require "thread"
 require "socket"
 
+module Selenium
+  module WebDriver
+
+    # @private
+    module Chrome
+    end
+
+  end
+end

data/chrome/src/rb/lib/selenium/webdriver/chrome/bridge.rb

@@ -1,8 +1,9 @@
 module Selenium
   module WebDriver
     module Chrome
-      class Bridge
-        include BridgeHelper
+
+      # @private
+      class Bridge < Remote::Bridge
 
         def initialize
           @executor = CommandExecutor.new
@@ -19,73 +20,22 @@ module Selenium
           [DriverExtensions::TakesScreenshot]
         end
 
-        def get(url)
-          execute :request => 'get',
-                  :url     => url
-        end
-
-        def goBack
-          execute :request => 'goBack'
-        end
-
-        def goForward
-          execute :request => 'goForward'
-        end
-
-        def getCurrentUrl
-          execute :request => 'getCurrentUrl'
-        end
-
-        def getTitle
-          execute :request => 'getTitle'
-        end
-
-        def getPageSource
-          execute :request => 'getPageSource'
-        end
-
-        def switchToWindow(name)
-          execute :request    => 'switchToWindow',
-                  :windowName => name
-        end
-
-        def switchToFrame(id)
-          execute :request => 'switchToFrameByName',
-                  :name    => id
-        end
-
-        def switchToDefaultContent
-          execute :request => "switchToDefaultContent"
+        def capabilities
+          @capabilities ||= Remote::Capabilities.chrome
         end
 
         def quit
           begin
-            execute :request => 'quit'
+            super
           rescue IOError
           end
 
-          @launcher.kill
           @executor.close
+          @launcher.kill
         end
 
-        def close
-          execute :request => 'close'
-        end
-
-        def refresh
-          execute :request => 'refresh'
-        end
-
-        def getWindowHandles
-          execute :request => 'getWindowHandles'
-        end
-
-        def getCurrentWindowHandle
-          execute :request => 'getCurrentWindowHandle'
-        end
-
-        def getScreenshotAsBase64
-          execute :request => "screenshot"
+        def getScreenshot
+          execute :screenshot
         end
 
         def setSpeed(value)
@@ -96,91 +46,6 @@ module Selenium
           @speed
         end
 
-        def executeScript(script, *args)
-          typed_args = args.map { |e| wrap_script_argument(e) }
-
-          resp = execute :request => 'executeScript',
-                         :script  => script,
-                         :args    => typed_args
-
-          return if resp.nil?
-          unwrap_script_argument resp
-        end
-
-        def addCookie(cookie)
-          execute :request => 'addCookie',
-                  :cookie  => cookie
-        end
-
-        def deleteCookie(name)
-          execute :request => 'deleteCookie',
-                  :name    => name
-        end
-
-        def getAllCookies
-          execute :request => 'getCookies'
-        end
-
-        def deleteAllCookies
-          execute :request => 'deleteAllCookies'
-        end
-
-        def findElementByClassName(parent, class_name)
-          find_element_by 'class name', class_name, parent
-        end
-
-        def findElementsByClassName(parent, class_name)
-          find_elements_by 'class name', class_name, parent
-        end
-
-        def findElementById(parent, id)
-          find_element_by 'id', id, parent
-        end
-
-        def findElementsById(parent, id)
-          find_elements_by 'id', id, parent
-        end
-
-        def findElementByLinkText(parent, link_text)
-          find_element_by 'link text', link_text, parent
-        end
-
-        def findElementsByLinkText(parent, link_text)
-          find_elements_by 'link text', link_text, parent
-        end
-
-        def findElementByPartialLinkText(parent, link_text)
-          find_element_by 'partial link text', link_text, parent
-        end
-
-        def findElementsByPartialLinkText(parent, link_text)
-          find_elements_by 'partial link text', link_text, parent
-        end
-
-        def findElementByName(parent, name)
-          find_element_by 'name', name, parent
-        end
-
-        def findElementsByName(parent, name)
-          find_elements_by 'name', name, parent
-        end
-
-        def findElementByTagName(parent, tag_name)
-          find_element_by 'tag name', tag_name, parent
-        end
-
-        def findElementsByTagName(parent, tag_name)
-          find_elements_by 'tag name', tag_name, parent
-        end
-
-        def findElementByXpath(parent, xpath)
-          find_element_by 'xpath', xpath, parent
-        end
-
-        def findElementsByXpath(parent, xpath)
-          find_elements_by 'xpath', xpath, parent
-        end
-
         def findElementByCssSelector(parent, selector)
           find_element_by 'css selector', selector, parent
         end
@@ -189,154 +54,27 @@ module Selenium
           find_elements_by 'css selector', selector, parent
         end
 
-
-        #
-        # Element functions
-        #
-
-        def clickElement(element)
-          execute :request   => 'clickElement',
-                  :elementId => element
-        end
-
-        def getElementTagName(element)
-          execute :request   => 'getElementTagName',
-                  :elementId => element
-        end
-
-        def getElementAttribute(element, name)
-          execute :request   => 'getElementAttribute',
-                  :elementId => element,
-                  :attribute => name
-        end
-
-        def getElementValue(element)
-          execute :request   => 'getElementValue',
-                  :elementId => element
-        end
-
-        def getElementText(element)
-          execute :request   => 'getElementText',
-                  :elementId => element
-        end
-
-        def getElementLocation(element)
-          data = execute :request   => 'getElementLocation',
-                         :elementId => element
-
-          Point.new data['x'], data['y']
-        end
-
-        def getElementSize(element)
-          data = execute :request   => 'getElementSize',
-                         :elementId => element
-
-          Dimension.new data['width'], data['height']
-        end
-
-        def sendKeysToElement(element, string)
-          execute :request   => 'sendKeysToElement',
-                  :elementId => element,
-                  :keys      => string.split(//u)
-        end
-
-        def clearElement(element)
-          execute :request   => 'clearElement',
-                  :elementId => element
-        end
-
-        def isElementEnabled(element)
-          execute :request   => 'isElementEnabled',
-                  :elementId => element
-        end
-
-        def isElementSelected(element)
-          execute :request   => 'isElementSelected',
-                  :elementId => element
-        end
-
-        def isElementDisplayed(element)
-          execute :request   => 'isElementDisplayed',
-                  :elementId => element
-        end
-
-        def submitElement(element)
-          execute :request   => 'submitElement',
-                  :elementId => element
-        end
-
-        def toggleElement(element)
-          execute :request   => 'toggleElement',
-                  :elementId => element
-        end
-
-        def setElementSelected(element)
-          execute :request   => 'setElementSelected',
-                  :elementId => element
-        end
-
-        def getElementValueOfCssProperty(element, prop)
-          execute :request   => 'getElementValueOfCssProperty',
-                  :elementId => element,
-                  :css       => prop
-        end
-
-        def getActiveElement
-          Element.new self, element_id_from(execute(:request => 'getActiveElement'))
-        end
-        alias_method :switchToActiveElement, :getActiveElement
-
-        def hoverOverElement(element)
-          execute :request   => 'hoverOverElement',
-                  :elementId => element
+        def getAllCookies
+          execute :getCookies
         end
 
-        def dragElement(element, rigth_by, down_by)
-          raise UnsupportedOperationError, "drag and drop unsupported in Chrome"
-          execute :drag_element, {:id => element}, element, rigth_by, down_by
+        def deleteCookie(name)
+          execute :deleteCookie, :name => name
         end
 
         private
 
-        def find_element_by(how, what, parent = nil)
-          if parent
-            id = execute :request => 'findChildElement',
-                         :id      => parent,
-                         :using   => how,
-                         :value   => what
-          else
-            id = execute :request => 'findElement',
-                         :using   => how,
-                         :value   => what
-          end
-
-          Element.new self, element_id_from(id)
-        end
-
-        def find_elements_by(how, what, parent = nil)
-          if parent
-            ids = execute :request => 'findChildElements',
-                          :id      => parent,
-                          :using   => how,
-                          :value   => what
-          else
-            ids = execute :request => 'findElements',
-                          :using   => how,
-                          :value   => what
-          end
-
-          ids.map { |id| Element.new self, element_id_from(id) }
-        end
-
+        def execute(command_name, opts = {}, args = nil)
+          command = {:request => command_name}.merge(opts)
+          command.merge!(args) if args
 
-        private
+          command = camel_case_keys_in(command)
 
-        def execute(command)
           puts "--> #{command.inspect}" if $DEBUG
           resp = raw_execute command
           puts "<-- #{resp.inspect}" if $DEBUG
 
-          code = resp['statusCode']
+          code = resp['status']
           if e = Error.for_code(code)
             msg = resp['value']['message'] if resp['value']
             msg ||= "unknown exception for #{command.inspect}"
@@ -352,6 +90,26 @@ module Selenium
           @executor.execute command
         end
 
+        #
+        # TODO(jari): fix this in the remote driver
+        #
+
+        def camel_case(string)
+          parts = string.split('_')
+          parts[1..-1].map { |e| e.capitalize! }
+          parts.join
+        end
+
+        def camel_case_keys_in(hash)
+          h = {}
+
+          hash.each do |key, value|
+            h[camel_case(key.to_s)] = value
+          end
+
+          h
+        end
+
       end # Bridge
     end # Chrome
   end # WebDriver

data/chrome/src/rb/lib/selenium/webdriver/chrome/command_executor.rb

@@ -1,124 +1,126 @@
 module Selenium
   module WebDriver
     module Chrome
-     class CommandExecutor
-       HTML_TEMPLATE = "HTTP/1.1 200 OK\r\nContent-Length: %d\r\nContent-Type: text/html; charset=UTF-8\r\n\r\n%s"
-       JSON_TEMPLATE = "HTTP/1.1 200 OK\r\nContent-Length: %d\r\nContent-Type: application/json; charset=UTF-8\r\n\r\n%s"
-
-       def initialize
-         @server       = TCPServer.new(localhost, 0)
-         @queue        = Queue.new
-
-         @accepted_any = false
-         @next_socket  = nil
-         @listening    = true
-
-         Thread.new { start_run_loop }
-       end
-
-       def execute(command)
-         until accepted_any?
-           Thread.pass
-           sleep 0.01
-         end
-
-         json = command.to_json
-         data = JSON_TEMPLATE % [json.length, json]
-
-         @next_socket.write data
-         @next_socket.close
-
-         JSON.parse read_response(@queue.pop)
-       end
-
-       def close
-         stop_listening
-         close_sockets
-         @server.close unless @server.closed?
-       rescue IOError
-         nil
-       end
-
-       def port
-         @server.addr[1]
-       end
-
-       def uri
-         "http://localhost:#{port}/chromeCommandExecutor"
-       end
-
-       private
-
-       def localhost
-         Platform.ironruby? ? "localhost" : "0.0.0.0" # yeah, weird..
-       end
-
-       def start_run_loop
-         while(@listening) do
-           socket = @server.accept
-
-           if socket.read(1) == "G" # initial GET(s)
-             write_holding_page_to socket
-           else
-             if accepted_any?
-               @queue << socket
-             else
-               read_response(socket)
-               @accepted_any = true
-             end
-           end
-         end
-       rescue IOError, Errno::EBADF
-         raise unless @server.closed?
-       end
-
-       def read_response(socket)
-         result = ''
-         seen_double_crlf = false
-
-         while line = next_line(socket)
-           seen_double_crlf = true if line.empty?
-           result << "#{line}\n" if seen_double_crlf
-         end
-
-         @next_socket = socket
-
-         result.strip!
-       end
-
-       def accepted_any?
-         @accepted_any
-       end
-
-       def close_sockets
-         @queue.pop.close until @queue.empty?
-         @next_socket.close if @next_socket
-       end
-
-       def stop_listening
-         @listening = false
-       end
-
-       def next_line(socket)
-        return if socket.closed?
-        input = socket.gets
-
-        raise Error::WebDriverError, "unexpected EOF from Chrome" if input.nil?
 
-        line = input.chomp
-        return if line == "EOResponse"
-
-        line
-       end
-
-       def write_holding_page_to(socket)
-         msg = %[<html><head><script type='text/javascript'>if (window.location.search == '') { setTimeout("window.location = window.location.href + '?reloaded'", 5000); }</script></head><body><p>ChromeDriver server started and connected.  Please leave this tab open.</p></body></html>]
-
-         socket.write HTML_TEMPLATE % [msg.length, msg]
-         socket.close
-       end
-
-     end # CommandExecutor
+      # @private
+      class CommandExecutor
+        HTML_TEMPLATE = "HTTP/1.1 200 OK\r\nContent-Length: %d\r\nContent-Type: text/html; charset=UTF-8\r\n\r\n%s"
+        JSON_TEMPLATE = "HTTP/1.1 200 OK\r\nContent-Length: %d\r\nContent-Type: application/json; charset=UTF-8\r\n\r\n%s"
+
+        def initialize
+          @server       = TCPServer.new(localhost, 0)
+          @queue        = Queue.new
+
+          @accepted_any = false
+          @next_socket  = nil
+          @listening    = true
+
+          Thread.new { start_run_loop }
+        end
+
+        def execute(command)
+          until accepted_any?
+            Thread.pass
+            sleep 0.01
+          end
+
+          json = command.to_json
+          data = JSON_TEMPLATE % [json.length, json]
+
+          @next_socket.write data
+          @next_socket.close
+
+          JSON.parse read_response(@queue.pop)
+        end
+
+        def close
+          stop_listening
+          close_sockets
+          @server.close unless @server.closed?
+        rescue IOError
+          nil
+        end
+
+        def port
+          @server.addr[1]
+        end
+
+        def uri
+          "http://localhost:#{port}/chromeCommandExecutor"
+        end
+
+        private
+
+        def localhost
+          Platform.ironruby? ? "localhost" : "0.0.0.0" # yeah, weird..
+        end
+
+        def start_run_loop
+          while(@listening) do
+            socket = @server.accept
+
+            if socket.read(1) == "G" # initial GET(s)
+              write_holding_page_to socket
+            else
+              if accepted_any?
+                @queue << socket
+              else
+                read_response(socket)
+                @accepted_any = true
+              end
+            end
+          end
+        rescue IOError, Errno::EBADF
+          raise if @listening
+        end
+
+        def read_response(socket)
+          result = ''
+          seen_double_crlf = false
+
+          while line = next_line(socket)
+            seen_double_crlf = true if line.empty?
+            result << "#{line}\n" if seen_double_crlf
+          end
+
+          @next_socket = socket
+
+          result.strip!
+        end
+
+        def accepted_any?
+          @accepted_any
+        end
+
+        def close_sockets
+          @next_socket.close if @next_socket
+          @queue.pop.close until @queue.empty?
+        end
+
+        def stop_listening
+          @listening = false
+        end
+
+        def next_line(socket)
+          return if socket.closed?
+          input = socket.gets
+
+          raise Error::WebDriverError, "unexpected EOF from Chrome" if input.nil?
+
+          line = input.chomp
+          return if line == "EOResponse"
+
+          line
+        end
+
+        def write_holding_page_to(socket)
+          msg = %[<html><head><script type='text/javascript'>if (window.location.search == '') { setTimeout("window.location = window.location.href + '?reloaded'", 5000); }</script></head><body><p>ChromeDriver server started and connected.  Please leave this tab open.</p></body></html>]
+
+          socket.write HTML_TEMPLATE % [msg.length, msg]
+          socket.close
+        end
+
+      end # CommandExecutor
     end # Chrome
   end # WebDriver
 end # Selenium