selenium-webdriver 2.18.0.rc2 → 2.18.0.rc3

data/lib/selenium/webdriver.rb

@@ -10,6 +10,7 @@ module Selenium
   module WebDriver
     Point     = Struct.new(:x, :y)
     Dimension = Struct.new(:width, :height)
+    Location  = Struct.new(:latitude, :longitude, :altitude)
 
     autoload :Android, 'selenium/webdriver/android'
     autoload :Chrome,  'selenium/webdriver/chrome'

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

@@ -29,7 +29,10 @@ module Selenium
           [
             DriverExtensions::TakesScreenshot,
             DriverExtensions::Rotatable,
-            DriverExtensions::HasInputDevices
+            DriverExtensions::HasInputDevices,
+            DriverExtensions::HasWebStorage,
+            DriverExtensions::HasLocation,
+            DriverExtensions::HasBrowserConnection
           ]
         end
 
@@ -48,4 +51,4 @@ module Selenium
       end # Bridge
     end # Android
   end # WebDriver
-end # Selenium
+end # Selenium

data/lib/selenium/webdriver/common.rb

@@ -19,9 +19,15 @@ require 'selenium/webdriver/common/window'
 require 'selenium/webdriver/common/options'
 require 'selenium/webdriver/common/search_context'
 require 'selenium/webdriver/common/action_builder'
+require 'selenium/webdriver/common/html5/shared_web_storage'
+require 'selenium/webdriver/common/html5/local_storage'
+require 'selenium/webdriver/common/html5/session_storage'
 require 'selenium/webdriver/common/driver_extensions/takes_screenshot'
 require 'selenium/webdriver/common/driver_extensions/rotatable'
+require 'selenium/webdriver/common/driver_extensions/has_browser_connection'
 require 'selenium/webdriver/common/driver_extensions/has_input_devices'
+require 'selenium/webdriver/common/driver_extensions/has_web_storage'
+require 'selenium/webdriver/common/driver_extensions/has_location'
 require 'selenium/webdriver/common/driver_extensions/uploads_files'
 require 'selenium/webdriver/common/keys'
 require 'selenium/webdriver/common/bridge_helper'

data/lib/selenium/webdriver/common/driver_extensions/has_browser_connection.rb

@@ -0,0 +1,17 @@
+module Selenium
+  module WebDriver
+    module DriverExtensions
+
+      module HasBrowserConnection
+        def online?
+          @bridge.isBrowserOnline
+        end
+
+        def online=(bool)
+          @bridge.setBrowserOnline bool
+        end
+      end
+
+    end
+  end
+end

data/lib/selenium/webdriver/common/driver_extensions/has_location.rb

@@ -0,0 +1,25 @@
+module Selenium
+  module WebDriver
+    module DriverExtensions
+
+      module HasLocation
+        def location
+          @bridge.getLocation
+        end
+
+        def location=(loc)
+          unless loc.kind_of?(Location)
+            raise TypeError, "expected #{Location}, got #{loc.inspect}:#{loc.class}"
+          end
+
+          @bridge.setLocation loc.latitude, loc.longitude, loc.altitude
+        end
+
+        def set_location(lat, lon, alt)
+          self.location = Location.new(Float(lat), Float(lon), Float(alt))
+        end
+      end
+
+    end
+  end
+end

data/lib/selenium/webdriver/common/driver_extensions/has_web_storage.rb

@@ -0,0 +1,22 @@
+module Selenium
+  module WebDriver
+
+    #
+    # @api private
+    #
+
+    module DriverExtensions
+      module HasWebStorage
+
+        def local_storage
+          HTML5::LocalStorage.new @bridge
+        end
+
+        def session_storage
+          HTML5::SessionStorage.new @bridge
+        end
+
+      end # HasWebStorage
+    end # DriverExtensions
+  end # WebDriver
+end # Selenium

data/lib/selenium/webdriver/common/html5/local_storage.rb

@@ -0,0 +1,42 @@
+module Selenium
+  module WebDriver
+    module HTML5
+
+      class LocalStorage
+        include SharedWebStorage
+
+        #
+        # @api private
+        #
+        def initialize(bridge)
+          @bridge = bridge
+        end
+
+        def [](key)
+          @bridge.getLocalStorageItem key
+        end
+
+        def []=(key, value)
+          @bridge.setLocalStorageItem key, value
+        end
+
+        def delete(key)
+          @bridge.removeLocalStorageItem key
+        end
+
+        def clear
+          @bridge.clearLocalStorage
+        end
+
+        def size
+          @bridge.getLocalStorageSize
+        end
+
+        def keys
+          @bridge.getLocalStorageKeys.reverse
+        end
+      end
+
+    end
+  end
+end

data/lib/selenium/webdriver/common/html5/session_storage.rb

@@ -0,0 +1,44 @@
+module Selenium
+  module WebDriver
+    module HTML5
+
+      class SessionStorage
+        include Enumerable
+        include SharedWebStorage
+
+        def [](key)
+          @bridge.getSessionStorageItem key
+        end
+
+        def []=(key, value)
+          @bridge.setSessionStorageItem key, value
+        end
+
+        def delete(key)
+          @bridge.removeSessionStorageItem key
+        end
+
+        def clear
+          @bridge.clearSessionStorage
+        end
+
+        def size
+          @bridge.getSessionStorageSize
+        end
+
+        def keys
+          @bridge.getSessionStorageKeys.reverse
+        end
+
+        #
+        # @api private
+        #
+
+        def initialize(bridge)
+          @bridge = bridge
+        end
+      end
+
+    end
+  end
+end

data/lib/selenium/webdriver/common/html5/shared_web_storage.rb

@@ -0,0 +1,42 @@
+module Selenium
+  module WebDriver
+    module HTML5
+
+      module SharedWebStorage
+        include Enumerable
+
+        def key?(key)
+          keys.include? key
+        end
+        alias_method :member?, :key?
+        alias_method :has_key?, :key?
+
+        def fetch(key, &blk)
+          if self.key? key
+            return self[key]
+          end
+
+          if block_given?
+            yield key
+          else
+            # should be KeyError, but it's 1.9-specific
+            raise IndexError, "missing key #{key.inspect}" 
+          end
+        end
+
+        def empty?
+          size == 0
+        end
+
+        def each(&blk)
+          return enum_for(:each) unless block_given?
+
+          keys.each do |k|
+            yield k, self[k]
+          end
+        end
+      end
+
+    end
+  end
+end

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

@@ -149,6 +149,10 @@ module Selenium
         info[0][3]
       end
 
+      def ip
+        IPSocket.getaddress(Socket.gethostname)
+      end
+
     end # Platform
   end # WebDriver
 end # Selenium
@@ -162,5 +166,6 @@ if __FILE__ == $0
     :windows?  => Selenium::WebDriver::Platform.windows?,
     :home      => Selenium::WebDriver::Platform.home,
     :bitsize   => Selenium::WebDriver::Platform.bitsize,
-    :localhost => Selenium::WebDriver::Platform.localhost
+    :localhost => Selenium::WebDriver::Platform.localhost,
+    :ip        => Selenium::WebDriver::Platform.ip
 end

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

@@ -7,7 +7,7 @@ module Selenium
 
       class Bridge < Remote::Bridge
 
-        DEFAULT_URL = "http://#{Platform.localhost}:3001/hub/"
+        DEFAULT_URL = "http://#{Platform.localhost}:3001/wd/hub/"
 
         def initialize(opts = {})
           remote_opts = {
@@ -27,7 +27,9 @@ module Selenium
         def driver_extensions
           [
             DriverExtensions::TakesScreenshot,
-            DriverExtensions::HasInputDevices
+            DriverExtensions::HasInputDevices,
+            DriverExtensions::HasWebStorage,
+            DriverExtensions::HasLocation
           ]
         end
 

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

@@ -195,6 +195,10 @@ module Selenium
           execute :refresh
         end
 
+        #
+        # window handling
+        #
+
         def getWindowHandles
           execute :getWindowHandles
         end
@@ -230,6 +234,80 @@ module Selenium
           execute :screenshot
         end
 
+        #
+        # HTML 5
+        #
+
+        def getLocalStorageItem(key)
+          execute :getLocalStorageItem, :key => key
+        end
+
+        def removeLocalStorageItem(key)
+          execute :removeLocalStorageItem, :key => key
+        end
+
+        def getLocalStorageKeys
+          execute :getLocalStorageKeys
+        end
+
+        def setLocalStorageItem(key, value)
+          execute :setLocalStorageItem, {}, :key => key, :value => value
+        end
+
+        def clearLocalStorage
+          execute :clearLocalStorage
+        end
+
+        def getLocalStorageSize
+          execute :getLocalStorageSize
+        end
+
+        def getSessionStorageItem(key)
+          execute :getSessionStorageItem, :key => key
+        end
+
+        def removeSessionStorageItem(key)
+          execute :removeSessionStorageItem, :key => key
+        end
+
+        def getSessionStorageKeys
+          execute :getSessionStorageKeys
+        end
+
+        def setSessionStorageItem(key, value)
+          execute :setSessionStorageItem, {}, :key => key, :value => value
+        end
+
+        def clearSessionStorage
+          execute :clearSessionStorage
+        end
+
+        def getSessionStorageSize
+          execute :getSessionStorageSize
+        end
+
+        def getLocation
+          obj = execute(:getLocation) || {} # android returns null
+          Location.new obj['latitude'], obj['longitude'], obj['altitude']
+        end
+
+        def setLocation(lat, lon, alt)
+          loc = {:latitude => lat, :longitude => lon, :altitude => alt}
+          execute :setLocation, {}, :location => loc
+        end
+
+        def isBrowserOnline
+          execute :isBrowserOnline
+        end
+
+        def setBrowserOnline(bool)
+          execute :setBrowserOnline, {}, :state => bool
+        end
+
+        #
+        # javascript execution
+        #
+
         def executeScript(script, *args)
           assert_javascript_enabled
 
@@ -244,6 +322,10 @@ module Selenium
           unwrap_script_result result
         end
 
+        #
+        # cookies
+        #
+
         def addCookie(cookie)
           execute :addCookie, {}, :cookie => cookie
         end
@@ -260,6 +342,10 @@ module Selenium
           execute :deleteAllCookies
         end
 
+        #
+        # actions
+        #
+
         def clickElement(element)
           execute :clickElement, :id => element
         end
@@ -298,6 +384,39 @@ module Selenium
           execute :sendKeysToActiveElement, {}, :value => key
         end
 
+        def sendKeysToElement(element, keys)
+          if @file_detector && local_file = @file_detector.call(keys)
+            keys = upload(local_file)
+          end
+
+          execute :sendKeysToElement, {:id => element}, {:value => Array(keys)}
+        end
+
+        def upload(local_file)
+          unless File.file?(local_file)
+            raise WebDriverError::Error, "you may only upload files: #{local_file.inspect}"
+          end
+
+          execute :uploadFile, {}, :file => Zipper.zip_file(local_file)
+        end
+
+        def clearElement(element)
+          execute :clearElement, :id => element
+        end
+
+
+        def submitElement(element)
+          execute :submitElement, :id => element
+        end
+
+        def dragElement(element, right_by, down_by)
+          execute :dragElement, {:id => element}, :x => right_by, :y => down_by
+        end
+
+        #
+        # element properties
+        #
+
         def getElementTagName(element)
           execute :getElementTagName, :id => element
         end
@@ -332,26 +451,6 @@ module Selenium
           Dimension.new data['width'], data['height']
         end
 
-        def sendKeysToElement(element, keys)
-          if @file_detector && local_file = @file_detector.call(keys)
-            keys = upload(local_file)
-          end
-
-          execute :sendKeysToElement, {:id => element}, {:value => Array(keys)}
-        end
-
-        def upload(local_file)
-          unless File.file?(local_file)
-            raise WebDriverError::Error, "you may only upload files: #{local_file.inspect}"
-          end
-
-          execute :uploadFile, {}, :file => Zipper.zip_file(local_file)
-        end
-
-        def clearElement(element)
-          execute :clearElement, :id => element
-        end
-
         def isElementEnabled(element)
           execute :isElementEnabled, :id => element
         end
@@ -363,28 +462,10 @@ module Selenium
         def isElementDisplayed(element)
           execute :isElementDisplayed, :id => element
         end
-
-        def submitElement(element)
-          execute :submitElement, :id => element
-        end
-
-        def setElementSelected(element)
-          execute :setElementSelected, :id => element
-        end
-
         def getElementValueOfCssProperty(element, prop)
           execute :getElementValueOfCssProperty, :id => element, :property_name => prop
         end
 
-        def getActiveElement
-          Element.new self, element_id_from(execute(:getActiveElement))
-        end
-        alias_method :switchToActiveElement, :getActiveElement
-
-        def dragElement(element, right_by, down_by)
-          execute :dragElement, {:id => element}, :x => right_by, :y => down_by
-        end
-
         def elementEquals(element, other)
           if element.ref == other.ref
             true
@@ -393,6 +474,15 @@ module Selenium
           end
         end
 
+        #
+        # finding elements
+        #
+
+        def getActiveElement
+          Element.new self, element_id_from(execute(:getActiveElement))
+        end
+        alias_method :switchToActiveElement, :getActiveElement
+
         def find_element_by(how, what, parent = nil)
           if parent
             id = execute :findChildElement, {:id => parent}, {:using => how, :value => what}

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

@@ -98,7 +98,6 @@ class Selenium::WebDriver::Remote::Bridge
   command :getElementTagName,                      :get,     "session/:session_id/element/:id/name"
   command :clearElement,                           :post,    "session/:session_id/element/:id/clear"
   command :isElementSelected,                      :get,     "session/:session_id/element/:id/selected"
-  command :setElementSelected,                     :post,    "session/:session_id/element/:id/selected"
   command :isElementEnabled,                       :get,     "session/:session_id/element/:id/enabled"
   command :getElementAttribute,                    :get,     "session/:session_id/element/:id/attribute/:name"
   command :elementEquals,                          :get,     "session/:session_id/element/:id/equals/:other"
@@ -134,11 +133,14 @@ class Selenium::WebDriver::Remote::Bridge
   #
 
   command :executeSql,                             :post,   "session/:session_id/execute_sql"
+
   command :getLocation,                            :get,    "session/:session_id/location"
   command :setLocation,                            :post,   "session/:session_id/location"
+
   command :getAppCache,                            :get,    "session/:session_id/application_cache"
   command :getAppCacheStatus,                      :get,    "session/:session_id/application_cache/status"
   command :clearAppCache,                          :delete, "session/:session_id/application_cache/clear"
+
   command :isBrowserOnline,                        :get,    "session/:session_id/browser_connection"
   command :setBrowserOnline,                       :post,   "session/:session_id/browser_connection"
 

metadata

@@ -2,7 +2,7 @@
 name: selenium-webdriver
 version: !ruby/object:Gem::Version 
   prerelease: 7
-  version: 2.18.0.rc2
+  version: 2.18.0.rc3
 platform: ruby
 authors: 
   - Jari Bakken
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-24 00:00:00 +01:00
+date: 2012-01-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -166,10 +166,17 @@ files:
   - lib/selenium/webdriver/common/core_ext/base64.rb
   - lib/selenium/webdriver/common/core_ext/dir.rb
   - lib/selenium/webdriver/common/core_ext/string.rb
+  - lib/selenium/webdriver/common/driver_extensions/has_browser_connection.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_web_storage.rb
   - lib/selenium/webdriver/common/driver_extensions/rotatable.rb
   - 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/firefox/binary.rb
   - lib/selenium/webdriver/firefox/bridge.rb
   - lib/selenium/webdriver/firefox/extension.rb