[rb] move input device encode method to superclass

titusfortner · titusfortner · commit 7c78f9e51016 · 2021-12-01T00:15:26.000-06:00
diff --git a/rb/lib/selenium/webdriver/common/interactions/input_device.rb b/rb/lib/selenium/webdriver/common/interactions/input_device.rb
@@ -55,6 +55,10 @@ def no_actions? # Determine if only pauses are present
           actions = @actions.reject { |action| action.type == :pause }
           actions.empty?
         end
+
+        def encode
+          {type: type, id: name, actions: @actions.map(&:encode)} unless no_actions?
+        end
       end # InputDevice
     end # Interactions
   end # WebDriver
diff --git a/rb/lib/selenium/webdriver/common/interactions/key_input.rb b/rb/lib/selenium/webdriver/common/interactions/key_input.rb
@@ -33,12 +33,6 @@ def type
           Interactions::KEY
         end
 
-        def encode
-          return nil if no_actions?
-
-          {type: type, id: name, actions: @actions.map(&:encode)}
-        end
-
         def create_key_down(key)
           add_action(TypingInteraction.new(self, :down, key))
         end
diff --git a/rb/lib/selenium/webdriver/common/interactions/none_input.rb b/rb/lib/selenium/webdriver/common/interactions/none_input.rb
@@ -31,12 +31,6 @@ class NoneInput < InputDevice
         def type
           Interactions::NONE
         end
-
-        def encode
-          return nil if no_actions?
-
-          {type: type, id: name, actions: @actions.map(&:encode)}
-        end
       end # NoneInput
     end # Interactions
   end # WebDriver
diff --git a/rb/lib/selenium/webdriver/common/interactions/pointer_input.rb b/rb/lib/selenium/webdriver/common/interactions/pointer_input.rb
@@ -41,10 +41,8 @@ def type
         end
 
         def encode
-          return nil if no_actions?
-
-          output = {type: type, id: name, actions: @actions.map(&:encode)}
-          output[:parameters] = {pointerType: kind}
+          output = super
+          output[:parameters] = {pointerType: kind} if output
           output
         end
 
diff --git a/rb/spec/unit/selenium/webdriver/common/interactions/interaction_spec.rb b/rb/spec/unit/selenium/webdriver/common/interactions/interaction_spec.rb
@@ -27,10 +27,6 @@ def type
           :special
         end
 
-        def encode
-          {type: type, name: name, actions: @actions.map(&:encode)}
-        end
-
         def create_special(val)
           add_action(NewInteraction.new(self, val))
         end
@@ -77,7 +73,7 @@ def special_input(device = nil)
           sub_action_builder.special_action('special').perform
 
           expect(bridge).to have_received(:send_actions).with([{type: :special,
-                                                                name: 'new',
+                                                                id: 'new',
                                                                 actions: [{type: :newType,
                                                                            special: 'special'}]}])
         end
