Add support for click delay and offset position

Author: route

.gitignore

@@ -1,2 +1,3 @@
 .byebug_history
 Gemfile.*
+.ruby-version

lib/capybara/cuprite/node.rb

@@ -144,16 +144,16 @@ def disabled?
       command(:disabled?)
     end
 
-    def click(keys = [], offset = {})
-      prepare_and_click(:left, __method__, keys, offset)
+    def click(keys = [], **options)
+      prepare_and_click(:left, __method__, keys, options)
     end
 
-    def right_click(keys = [], offset = {})
-      prepare_and_click(:right, __method__, keys, offset)
+    def right_click(keys = [], **options)
+      prepare_and_click(:right, __method__, keys, options)
     end
 
-    def double_click(keys = [], offset = {})
-      prepare_and_click(:double, __method__, keys, offset)
+    def double_click(keys = [], **options)
+      prepare_and_click(:double, __method__, keys, options)
     end
 
     def hover
@@ -225,9 +225,12 @@ def as_json(*)
 
     private
 
-    def prepare_and_click(mode, name, keys, offset)
+    def prepare_and_click(mode, name, keys, options)
+      delay = options[:delay].to_i
+      x, y = options.values_at(:x, :y)
+      offset = { x: x, y: y, position: options[:offset] || :top }
       command(:before_click, name, keys, offset)
-      node.click(mode: mode, keys: keys, offset: offset)
+      node.click(mode: mode, keys: keys, offset: offset, delay: delay)
     end
 
     def filter_text(text)

lib/capybara/cuprite/page.rb

@@ -94,7 +94,12 @@ def reset_modals
 
     def before_click(node, name, keys = [], offset = {})
       evaluate_on(node: node, expression: "_cuprite.scrollIntoViewport(this)")
-      x, y = find_position(node, offset[:x], offset[:y])
+
+      # If offset is given it may go outside of the element and likely error
+      # will be raised that we detected another element at this position.
+      return true if offset[:x] || offset[:y]
+
+      x, y = find_position(node, **offset)
       evaluate_on(node: node, expression: "_cuprite.mouseEventTest(this, '#{name}', #{x}, #{y})")
       true
     rescue Ferrum::JavaScriptError => e
@@ -174,8 +179,8 @@ def prepare_page
       end
     end
 
-    def find_position(node, *args)
-      x, y = node.find_position(*args)
+    def find_position(node, **options)
+      x, y = node.find_position(**options)
     rescue Ferrum::BrowserError => e
       if e.message == "Could not compute content quads."
         raise MouseEventFailed.new("MouseEventFailed: click, none, 0, 0")

spec/spec_helper.rb

@@ -60,19 +60,10 @@ module TestSessions
     node Element#drop can drop multiple strings
     node #visible? details non-summary descendants should be non-visible
     node #visible? works when details is toggled open and closed
-    #all with obscured filter should only find nodes on top in the viewport when fals
+    #all with obscured filter should only find nodes on top in the viewport when false
     #all with obscured filter should not find nodes on top outside the viewport when false
     #all with obscured filter should find top nodes outside the viewport when true
     #all with obscured filter should only find non-top nodes when true
-    #click offset when w3c_click_offset is false should offset outside the element
-    #click offset when w3c_click_offset is true should offset from center of element
-    #click offset when w3c_click_offset is true should offset outside from center of element
-    #double_click offset when w3c_click_offset is false should offset outside the element
-    #double_click offset when w3c_click_offset is true should offset from center of element
-    #double_click offset when w3c_click_offset is true should offset outside from center of element
-    #right_click offset when w3c_click_offset is false should offset outside the element
-    #right_click offset when w3c_click_offset is true should offset from center of element
-    #right_click offset when w3c_click_offset is true should offset outside from center of element
     #fill_in should fill in a color field
     #has_field with valid should be false if field is invalid
     #find with spatial filters should find an element above another element