[rb] remove extra keyword from PointerMove

titusfortner · titusfortner · commit 70cb566dc473 · 2021-12-01T00:15:26.000-06:00
diff --git a/rb/lib/selenium/webdriver/common/interactions/pointer_actions.rb b/rb/lib/selenium/webdriver/common/interactions/pointer_actions.rb
@@ -111,7 +111,7 @@ def move_to(element, right_by = nil, down_by = nil, device: nil)
         pointer.create_pointer_move(duration: default_move_duration,
                                     x: left,
                                     y: top,
-                                    element: element)
+                                    origin: element)
         tick(pointer)
         self
       end
diff --git a/rb/lib/selenium/webdriver/common/interactions/pointer_input.rb b/rb/lib/selenium/webdriver/common/interactions/pointer_input.rb
@@ -48,8 +48,8 @@ def assert_kind(pointer)
           KIND[pointer]
         end
 
-        def create_pointer_move(duration: 0, x: 0, y: 0, element: nil, origin: nil)
-          add_action(PointerMove.new(self, duration, x, y, element: element, origin: origin))
+        def create_pointer_move(duration: 0, x: 0, y: 0, origin: nil)
+          add_action(PointerMove.new(self, duration, x, y, origin: origin))
         end
 
         def create_pointer_down(button)
@@ -115,19 +115,17 @@ def initialize(source, duration, x, y, element: nil, origin: nil)
           @duration = duration * 1000
           @x_offset = x
           @y_offset = y
-          @origin = element || origin
+          @origin = element || origin || :viewport
         end
 
         def type
           :pointerMove
         end
 
         def encode
-          output = {type: type, duration: @duration.to_i, x: @x_offset, y: @y_offset}
-          output[:origin] = @origin
-          output
+          {type: type, duration: @duration.to_i, x: @x_offset, y: @y_offset, origin: @origin}
         end
-      end # Move
+      end # PointerMove
 
       class PointerCancel < Interaction
         def type
@@ -137,7 +135,7 @@ def type
         def encode
           {type: type}
         end
-      end # Cancel
+      end # PointerCancel
     end # Interactions
   end # WebDriver
 end # Selenium
diff --git a/rb/spec/unit/selenium/webdriver/common/interactions/pointer_actions_spec.rb b/rb/spec/unit/selenium/webdriver/common/interactions/pointer_actions_spec.rb
@@ -114,7 +114,7 @@ module WebDriver
           expect(mouse).to have_received(:create_pointer_move).with(duration: duration,
                                                                     x: right_by - dimension / 2,
                                                                     y: down_by - dimension / 2,
-                                                                    element: element)
+                                                                    origin: element)
         end
 
         it 'passes the pointer to the #tick method' do
diff --git a/rb/spec/unit/selenium/webdriver/common/interactions/pointer_input_spec.rb b/rb/spec/unit/selenium/webdriver/common/interactions/pointer_input_spec.rb
@@ -68,7 +68,7 @@ module Interactions
 
         describe '#create_pointer_move' do
           it 'executes #add_action with created interaction' do
-            allow(PointerMove).to receive(:new).with(pointer, 50, 51, 52, element: nil, origin: nil)
+            allow(PointerMove).to receive(:new).with(pointer, 50, 51, 52, origin: nil)
                                                .and_return(interaction)
             allow(pointer).to receive(:add_action).and_call_original
 
@@ -171,7 +171,7 @@ module Interactions
         describe '#encode' do
           context 'with element' do
             it 'returns a Hash with source, duration, x and y' do
-              move = PointerMove.new(source, duration, x, y, element: element)
+              move = PointerMove.new(source, duration, x, y, origin: element)
 
               ms = (duration * 1000).to_i
               expect(move.encode).to eq(type: move.type, origin: element, duration: ms, x: x, y: y)
