[rb] implement duration parameter for ActionBuilder constructor

titusfortner · titusfortner · commit 133cbec599fb · 2022-05-25T01:15:06.000-05:00
diff --git a/rb/lib/selenium/webdriver/common/action_builder.rb b/rb/lib/selenium/webdriver/common/action_builder.rb
@@ -43,8 +43,9 @@ class ActionBuilder
       #
 
       def initialize(bridge, deprecated_mouse = nil, deprecated_keyboard = nil, deprecated_async = nil,
-                     devices: [], async: false)
+                     devices: [], async: false, duration: 250)
         @bridge = bridge
+        @duration = duration
 
         @async = if deprecated_async.nil?
                    async
diff --git a/rb/lib/selenium/webdriver/common/interactions/pointer_actions.rb b/rb/lib/selenium/webdriver/common/interactions/pointer_actions.rb
@@ -23,11 +23,12 @@ module PointerActions
       attr_writer :default_move_duration
 
       #
-      # The overridable duration for movement used by methods in this module
+      # By default this is set to 250ms in the ActionBuilder constructor
+      # It can be overridden with default_move_duration=
       #
 
       def default_move_duration
-        @default_move_duration ||= 0.25 # 250 milliseconds
+        @default_move_duration ||= @duration / 1000 # convert ms to seconds
       end
 
       #
diff --git a/rb/lib/selenium/webdriver/common/interactions/wheel_actions.rb b/rb/lib/selenium/webdriver/common/interactions/wheel_actions.rb
@@ -20,8 +20,15 @@
 module Selenium
   module WebDriver
     module WheelActions
+      attr_writer :default_scroll_duration
+
+      #
+      # By default this is set to 250ms in the ActionBuilder constructor
+      # It can be overridden with default_scroll_duration=
+      #
+
       def default_scroll_duration
-        @default_scroll_duration ||= 0.25 # 250 milliseconds
+        @default_scroll_duration ||= @duration / 1000 # convert ms to seconds
       end
 
       #
diff --git a/rb/lib/selenium/webdriver/remote/bridge.rb b/rb/lib/selenium/webdriver/remote/bridge.rb
@@ -367,8 +367,8 @@ def delete_all_cookies
         # actions
         #
 
-        def action(deprecated_async = nil, async: false, devices: [])
-          ActionBuilder.new self, nil, nil, deprecated_async, async: async, devices: devices
+        def action(deprecated_async = nil, async: false, devices: [], duration: 250)
+          ActionBuilder.new self, nil, nil, deprecated_async, async: async, devices: devices, duration: duration
         end
         alias_method :actions, :action
 

Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,9 @@ class ActionBuilder`
`43`	`43`	`#`
`44`	`44`
`45`	`45`	`def initialize(bridge, deprecated_mouse = nil, deprecated_keyboard = nil, deprecated_async = nil,`
`46`		`- devices: [], async: false)`
	`46`	`+ devices: [], async: false, duration: 250)`
`47`	`47`	`@bridge = bridge`
	`48`	`+ @duration = duration`
`48`	`49`
`49`	`50`	`@async = if deprecated_async.nil?`
`50`	`51`	`async`
Original file line number	Diff line number	Diff line change
`@@ -23,11 +23,12 @@ module PointerActions`
`23`	`23`	`attr_writer :default_move_duration`
`24`	`24`
`25`	`25`	`#`
`26`		`- # The overridable duration for movement used by methods in this module`
	`26`	`+ # By default this is set to 250ms in the ActionBuilder constructor`
	`27`	`+ # It can be overridden with default_move_duration=`
`27`	`28`	`#`
`28`	`29`
`29`	`30`	`def default_move_duration`
`30`		`- @default_move_duration \|\|= 0.25 # 250 milliseconds`
	`31`	`+ @default_move_duration \|\|= @duration / 1000 # convert ms to seconds`
`31`	`32`	`end`
`32`	`33`
`33`	`34`	`#`
Original file line number	Diff line number	Diff line change
`@@ -367,8 +367,8 @@ def delete_all_cookies`
`367`	`367`	`# actions`
`368`	`368`	`#`
`369`	`369`
`370`		`- def action(deprecated_async = nil, async: false, devices: [])`
`371`		`- ActionBuilder.new self, nil, nil, deprecated_async, async: async, devices: devices`
	`370`	`+ def action(deprecated_async = nil, async: false, devices: [], duration: 250)`
	`371`	`+ ActionBuilder.new self, nil, nil, deprecated_async, async: async, devices: devices, duration: duration`
`372`	`372`	`end`
`373`	`373`	`alias_method :actions, :action`
`374`	`374`