lebowski 0.3.0 → 0.3.1

data/History.md

@@ -1,10 +1,19 @@
+# lebowski 0.3.1 January 23, 2011
+
+* Fixed mouse down and right mouse down user actions
+* Fixed double click user action
+* Fixed mouse event simulation bug. Event's which property now assigned the correct value
+
 # lebowski 0.3.0 December 6, 2010
 
 * Updated to now work with Ruby 1.9.2 and RSpec v2
 * Fixes drag and drop user actions
 * Fixes clicking on segmented view's buttons
 * Fixes mouse user actions so that, by default, DOM elements are clicked in the center instead of relative (0, 0)
-* Fixes RSpec extension That operator's contains? method 
+* Fixes RSpec extension That operator's contains? method
+* Added user actions mouse_wheel_delta_x and mouse_wheel_delta_y
+* View proxy now includes scrollable_parent_view method
+* Updated framework to build gem with Jeweler. Rubyforge and Hoe are no longer used 
 * Note: If creating an instance of the Selenium client driver that you want to pass to Lebowski's 
         MainApplication, you must now supply the client with a timeout value or else you will immediately get a 
         timeout error (e.g. set :timeout_in_seconds => 60)

data/License.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Michael Cohen <http://frozencanuck.wordpress.com>
+Copyright (c) 2010, 2011 Michael Cohen <http://frozencanuck.wordpress.com>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/lebowski/foundation/mixins/positioned_element.rb

@@ -33,7 +33,7 @@ module Lebowski
         end
         
         def scroll_to_visible()
-          
+          # no-op
         end
         
       end

data/lib/lebowski/foundation/mixins/user_actions.rb

@@ -27,11 +27,13 @@ module Lebowski
         end
         
         def mouse_down_at(x, y)
+          scroll_to_visible
           @driver.sc_mouse_down_at action_target, x, y, *action_locator_args
           stall :mouse_down
         end
         
         def right_mouse_down_at(x, y)
+          scroll_to_visible
           @driver.sc_right_mouse_down_at action_target, x, y, *action_locator_args
           stall :right_mouse_down
         end
@@ -47,6 +49,12 @@ module Lebowski
           stall :click
         end
         
+        def double_click_at(x, y)
+          scroll_to_visible
+          @driver.sc_double_click_at action_target, x, y, *action_locator_args
+          stall :double_click
+        end
+        
         def right_click_at(x, y)
           right_mouse_down_at x, y
           right_mouse_up_at x, y
@@ -86,6 +94,13 @@ module Lebowski
           right_mouse_up_at :center, :center
         end
         
+        #
+        # Used to perform a double click on this view in the remote application
+        #
+        def double_click()
+          double_click_at :center, :center
+        end
+        
         #
         # Used to perform a single click on this view in the remote application
         #
@@ -108,18 +123,11 @@ module Lebowski
         # Used to perform a single basic click on this view in the remote application
         #
         def basic_click()
+          scroll_to_visible
           @driver.sc_basic_click action_target, *action_locator_args
           stall :click
         end
         
-        #
-        # Used to perform a double click on this view in the remote application
-        #
-        def double_click()
-          @driver.sc_double_click action_target, *action_locator_args
-          stall :double_click
-        end
-        
         #
         # Used to perform a mouse wheel action on the x-axis
         #
@@ -223,8 +231,6 @@ module Lebowski
           # and drop user action
           @driver.sc_disable_all_autoscrolling
           
-          self.scroll_to_visible
-          
           mouse_down_at mouse_offset_x, mouse_offset_y
           mouse_move_at mouse_offset_x, mouse_offset_y
                     

data/lib/lebowski/runtime/sprout_core_extensions.rb

@@ -212,6 +212,11 @@ module Lebowski
         __remote_control_command("scMouseUpRightAt", [__locator(type, *params), encoded_params])
       end
       
+      def sc_double_click_at(type, x, y, *params)
+        encoded_params = ObjectEncoder.encode_hash({ :x => x, :y => y })
+        __remote_control_command("scDoubleClickAt", [__locator(type, *params), encoded_params])
+      end
+      
       def sc_basic_click(type, *params)
         __remote_control_command("click", [__locator(type, *params), ])
       end
@@ -224,10 +229,6 @@ module Lebowski
         __remote_control_command("scRightClick", [__locator(type, *params), ])
       end
       
-      def sc_double_click(type, *params)
-        __remote_control_command("scDoubleClick", [__locator(type, *params), ])
-      end
-      
       def sc_mouse_wheel_delta_x(type, delta, *params)
         __remote_control_command("scMouseWheelDeltaX", [__locator(type, *params), delta])
       end

data/lib/lebowski/version.rb

@@ -7,7 +7,7 @@ module Lebowski
   module Version
     MAJOR = 0
     MINOR = 3
-    PATCH = 0
+    PATCH = 1
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/resources/user-extensions.js

@@ -351,11 +351,28 @@ ScExt.MouseEventSimulation = {
     var element = selenium.browserbot.findElement(locator),
         coord = element ? $SC.viewportOffset(element) : { x: 0, y: 0 },
         width = element ? element.clientWidth : 0,
-        height = element ? element.clientHeight : 0;
+        height = element ? element.clientHeight : 0,
+        which = 1;
     
     x = x ? (x === 'center' ? width / 2 : x) : 0;
     y = y ? (y === 'center' ? height / 2 : y) : 0;
     
+    if ($SC.browser.msie) {
+      button = button ? button : 1;
+      switch (button) {
+        case 1: which = 1; break;
+        case 4: which = 2; break;
+        case 2: which = 3; break;
+      }
+    } else {
+      button = button ? button : 0;
+      switch (button) {
+        case 0: which = 1; break;
+        case 1: which = 2; break;
+        case 2: which = 3; break;
+      }
+    } 
+    
     var coords = element ? $SC.viewportOffset(element) : { x: 0, y: 0 },
         clientX = coords.x + x,
         clientY = coords.y + y;
@@ -368,7 +385,8 @@ ScExt.MouseEventSimulation = {
       pageX: clientX,
       pageY: clientY,
       bubbles: true,
-      button: button ? button : 0,
+      button: button,
+      which: which,
       altKey: selenium.browserbot.altKeyDown,
       metaKey: selenium.browserbot.metaKeyDown,
       ctrlKey: selenium.browserbot.controlKeyDown,
@@ -1319,6 +1337,22 @@ Selenium.prototype.doScMouseDownRightAt = function(locator, params) {
   } catch (e) {}
 };
 
+/**
+  Action performs a click at event
+*/
+Selenium.prototype.doScClickAt = function(locator, params) {  
+  this.doScMouseDownAt(locator, params);
+  this.doScMouseUpAt(locator, params);
+};
+
+/**
+  Action performs a double click at event
+*/
+Selenium.prototype.doScDoubleClickAt = function(locator, params) {  
+  this.doScClickAt(locator, params);
+  this.doScClickAt(locator, params);
+};
+
 /**
   Action performs a single click that is recognized by the SproutCore framework. 
 */

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Michael Cohen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-06 00:00:00 -05:00
+date: 2011-01-23 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -291,7 +291,7 @@ licenses:
 post_install_message: |
   **************************************************
   
-    Thank you for installing lebowski-0.3.0
+    Thank you for installing lebowski-0.3.1
   
     Please be sure to read the README.md and History.md
     for useful information on how to use this framework 
@@ -314,7 +314,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1711173086384596866
+      hash: 456298455366827608
       segments: 
       - 0
       version: "0"