selenium-webdriver 2.18.0 → 2.19.0.rc1

data/lib/selenium/client/selenium_helper.rb

@@ -4,31 +4,31 @@
 # object.
 module Selenium
   module Client
-    
+
     module SeleniumHelper
-    
+
       # Overrides default open method to actually delegates to @selenium
       def open(url)
         @selenium.open url
       end
-    
+
       # Overrides default type method to actually delegates to @selenium
       def type(locator, value)
         @selenium.type locator, value
       end
-    
+
       # Overrides default select method to actually delegates to @selenium
       def select(input_locator, option_locator)
         @selenium.select input_locator, option_locator
       end
 
-      # Delegates to @selenium on method missing 
+      # Delegates to @selenium on method missing
       def method_missing(method_name, *args)
         return super unless @selenium.respond_to?(method_name)
-        
+
         @selenium.send(method_name, *args)
-      end                  
+      end
     end
-    
+
   end
 end

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

@@ -32,7 +32,8 @@ module Selenium
             DriverExtensions::HasInputDevices,
             DriverExtensions::HasWebStorage,
             DriverExtensions::HasLocation,
-            DriverExtensions::HasBrowserConnection
+            DriverExtensions::HasBrowserConnection,
+            DriverExtensions::HasTouchScreen
           ]
         end
 

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

@@ -9,7 +9,7 @@ module Selenium
       class Service
         START_TIMEOUT = 20
         STOP_TIMEOUT  = 5
-        MISSING_TEXT  = "Unable to find the chromedriver executable. Please download the server from http://code.google.com/p/chromium/downloads/list and place it somewhere on your PATH. More info at http://code.google.com/p/selenium/wiki/ChromeDriver."
+        MISSING_TEXT  = "Unable to find the chromedriver executable. Please download the server from http://code.google.com/p/chromedriver/downloads/list and place it somewhere on your PATH. More info at http://code.google.com/p/selenium/wiki/ChromeDriver."
 
         attr_reader :uri
 

data/lib/selenium/webdriver/common.rb

@@ -12,6 +12,7 @@ require 'selenium/webdriver/common/wait'
 require 'selenium/webdriver/common/alert'
 require 'selenium/webdriver/common/mouse'
 require 'selenium/webdriver/common/keyboard'
+require 'selenium/webdriver/common/touch_screen'
 require 'selenium/webdriver/common/target_locator'
 require 'selenium/webdriver/common/navigation'
 require 'selenium/webdriver/common/timeouts'
@@ -19,6 +20,7 @@ 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/touch_action_builder'
 require 'selenium/webdriver/common/html5/shared_web_storage'
 require 'selenium/webdriver/common/html5/local_storage'
 require 'selenium/webdriver/common/html5/session_storage'
@@ -28,6 +30,7 @@ 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/has_touch_screen'
 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_touch_screen.rb

@@ -0,0 +1,19 @@
+module Selenium
+  module WebDriver
+    module DriverExtensions
+
+      module HasTouchScreen
+        def touch
+          TouchActionBuilder.new mouse, keyboard, touch_screen
+        end
+
+        private
+
+        def touch_screen
+          TouchScreen.new @bridge
+        end
+      end
+
+    end
+  end
+end

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

@@ -18,13 +18,14 @@ module Selenium
         # @api public
         #
 
-        def rotate(orientation)
+        def rotation=(orientation)
           unless ORIENTATIONS.include?(orientation)
             raise ArgumentError, "expected #{ORIENTATIONS.inspect}, got #{orientation.inspect}"
           end
 
           bridge.setScreenOrientation(orientation.to_s.upcase)
         end
+        alias_method :rotate, :rotation=
 
         #
         # Get the current screen orientation

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

@@ -1,7 +1,10 @@
 module Selenium
   module WebDriver
 
+    #
     # @api private
+    # @see ActionBuilder
+
     class Keyboard
 
       def initialize(bridge)

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

@@ -1,7 +1,11 @@
 module Selenium
   module WebDriver
 
+    #
     # @api private
+    # @see ActionBuilder
+    #
+
     class Mouse
 
       def initialize(bridge)

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

@@ -0,0 +1,64 @@
+module Selenium
+  module WebDriver
+    class TouchActionBuilder < ActionBuilder
+
+      #
+      # @api private
+      #
+
+      def initialize(mouse, keyboard, touch_screen)
+        super(mouse, keyboard)
+        @devices[:touch_screen] = touch_screen
+      end
+
+      def scroll(*args)
+        unless [2,3].include? args.size
+          raise ArgumentError, "wrong number of arguments, expected 2..3, got #{args.size}"
+        end
+
+        @actions << [:touch_screen, :scroll, args]
+        self
+      end
+
+      def flick(*args)
+        unless [2,4].include? args.size
+          raise ArgumentError, "wrong number of arguments, expected 2 or 4, got #{args.size}"
+        end
+
+        @actions << [:touch_screen, :flick, args]
+        self
+      end
+
+      def single_tap(element)
+        @actions << [:touch_screen, :single_tap, [element]]
+        self
+      end
+
+      def double_tap(element)
+        @actions << [:touch_screen, :double_tap, [element]]
+        self
+      end
+
+      def long_press(element)
+        @actions << [:touch_screen, :long_press, [element]]
+        self
+      end
+
+      def down(x, y = nil)
+        @actions << [:touch_screen, :down, [x, y]]
+        self
+      end
+
+      def up(x, y = nil)
+        @actions << [:touch_screen, :up, [x, y]]
+        self
+      end
+
+      def move(x, y = nil)
+        @actions << [:touch_screen, :move, [x, y]]
+        self
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,105 @@
+module Selenium
+  module WebDriver
+    class TouchScreen
+      FLICK_SPEED = { :normal => 0, :fast => 1}
+
+
+      #
+      # @api private
+      #
+
+      def initialize(bridge)
+        @bridge = bridge
+      end
+
+      def single_tap(element)
+        assert_element element
+        @bridge.touchSingleTap element.ref
+      end
+
+      def double_tap(element)
+        assert_element element
+        @bridge.touchDoubleTap element.ref
+      end
+
+      def long_press(element)
+        assert_element element
+        @bridge.touchLongPress element.ref
+      end
+
+      def down(x, y = nil)
+        x, y = coords_from x, y
+        @bridge.touchDown x, y
+      end
+
+      def up(x, y = nil)
+        x, y = coords_from x, y
+        @bridge.touchUp x, y
+      end
+
+      def move(x, y = nil)
+        x, y = coords_from x, y
+        @bridge.touchMove x, y
+      end
+
+      def scroll(*args)
+        case args.size
+        when 2
+          x, y = args
+          @bridge.touchScroll nil, x, y
+        when 3
+          element, x_offset, y_offset = args
+          assert_element element
+          @bridge.touchScroll element.ref, Integer(x_offset), Integer(y_offset)
+        else
+          raise ArgumentError, "wrong number of arguments, expected 2..3, got #{args.size}"
+        end
+      end
+
+      def flick(*args)
+        case args.size
+        when 2
+          x_speed, y_speed = args
+          @bridge.touchFlick Integer(x_speed), Integer(y_speed)
+        when 4
+          element, xoffset, yoffset, speed = args
+
+          assert_element element
+          flick_speed = FLICK_SPEED[speed.to_sym]
+
+          unless flick_speed
+            raise ArgumentError, "expected one of #{FLICK_SPEED.keys.inspect}, got #{speed.inspect}"
+          end
+
+          @bridge.touchElementFlick element.ref, Integer(xoffset), Integer(yoffset), flick_speed
+        else
+          raise ArgumentError, "wrong number of arguments, expected 2 or 4, got #{args.size}"
+        end
+
+      end
+
+      private
+
+      def coords_from(x, y)
+        if y.nil?
+          point = x
+
+          unless point.respond_to?(:x) && point.respond_to?(:y)
+            raise ArgumentError, "expected #{point.inspect} to respond to :x and :y"
+          end
+
+          x, y = point.x, point.y
+        end
+
+        [Integer(x), Integer(y)]
+      end
+
+      def assert_element(element)
+        unless element.kind_of? Element
+          raise TypeError, "expected #{Element}, got #{element.inspect}:#{element.class}"
+        end
+      end
+
+    end
+  end
+end

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

@@ -413,6 +413,52 @@ module Selenium
           execute :dragElement, {:id => element}, :x => right_by, :y => down_by
         end
 
+        def touchSingleTap(element)
+          execute :touchSingleTap, {}, :element => element
+        end
+
+        def touchDoubleTap(element)
+          execute :touchDoubleTap, {}, :element => element
+        end
+
+        def touchLongPress(element)
+          execute :touchLongPress, {}, :element => element
+        end
+
+        def touchDown(x, y)
+          execute :touchDown, {}, :x => x, :y => y
+        end
+
+        def touchUp(x, y)
+          execute :touchUp, {}, :x => x, :y => y
+        end
+
+        def touchMove(x, y)
+          execute :touchMove, {}, :x => x, :y => y
+        end
+
+        def touchScroll(element, x, y)
+          if element
+            execute :touchScroll, {}, :xoffset => x, :yoffset => y
+          else
+            execute :touchScroll, {}, :element => element,
+                                      :xoffset => x,
+                                      :yoffset => y
+          end
+        end
+
+        def touchFlick(xspeed, yspeed)
+          execute :touchFlick, {}, :xspeed => xspeed, :yspeed => yspeed
+        end
+
+        def touchElementFlick(element, right_by, down_by, speed)
+          execute :touchFlick, {}, :element => element,
+                                   :xoffset => right_by,
+                                   :yoffset => down_by,
+                                   :speed   => speed
+
+        end
+
         #
         # element properties
         #

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: selenium-webdriver
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 2.18.0
+  prerelease: 7
+  version: 2.19.0.rc1
 platform: ruby
 authors: 
   - Jari Bakken
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-27 00:00:00 +01:00
+date: 2012-02-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -160,6 +160,8 @@ files:
   - lib/selenium/webdriver/common/socket_poller.rb
   - lib/selenium/webdriver/common/target_locator.rb
   - lib/selenium/webdriver/common/timeouts.rb
+  - lib/selenium/webdriver/common/touch_action_builder.rb
+  - lib/selenium/webdriver/common/touch_screen.rb
   - lib/selenium/webdriver/common/wait.rb
   - lib/selenium/webdriver/common/window.rb
   - lib/selenium/webdriver/common/zipper.rb
@@ -169,6 +171,7 @@ files:
   - 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_touch_screen.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
@@ -229,9 +232,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.3.1
 requirements: []
 
 rubyforge_project: