[rb] fix PointerPress error handling

titusfortner · titusfortner · commit d5a708a4d578 · 2021-12-01T00:15:26.000-06:00
diff --git a/rb/lib/selenium/webdriver/common/interactions/pointer_input.rb b/rb/lib/selenium/webdriver/common/interactions/pointer_input.rb
@@ -80,18 +80,22 @@ def type
         end
 
         def assert_button(button)
-          if button.is_a? Symbol
-            raise TypeError, "#{button.inspect} is not a valid button!" unless BUTTONS.key? button
+          case button
+          when Symbol
+            raise ArgumentError, "#{button} is not a valid button!" unless BUTTONS.key? button
 
-            button = BUTTONS[button]
-          end
-          raise ArgumentError, 'Button number cannot be negative!' unless button >= 0
+            BUTTONS[button]
+          when Integer
+            raise ArgumentError, 'Button number cannot be negative!' if button.negative?
 
-          button
+            button
+          else
+            raise TypeError, "button must be a positive integer or one of #{BUTTONS.keys}, not #{button.class}"
+          end
         end
 
         def assert_direction(direction)
-          raise TypeError, "#{direction.inspect} is not a valid button direction" unless DIRECTIONS.key? direction
+          raise ArgumentError, "#{direction.inspect} is not a valid button direction" unless DIRECTIONS.key? direction
 
           DIRECTIONS[direction]
         end
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
@@ -119,8 +119,12 @@ module Interactions
         let(:press) { PointerPress.new(source, direction, button) }
 
         describe '#initialize' do
-          it 'raises a TypeError if invalid button symbol' do
-            expect { PointerPress.new(source, direction, :none) }.to raise_error(TypeError)
+          it 'raises a ArgumentError if invalid button symbol' do
+            expect { PointerPress.new(source, direction, :none) }.to raise_error(ArgumentError)
+          end
+
+          it 'raises an TypeError if button is not a symbol or integer' do
+            expect { PointerPress.new(source, direction, 'wrong') }.to raise_error(TypeError)
           end
 
           it 'raises an ArgumentError if button is negative' do
@@ -131,8 +135,8 @@ module Interactions
             expect { PointerPress.new(source, direction, 1141) }.not_to raise_error
           end
 
-          it 'raises a TypeError if invalid direction' do
-            expect { PointerPress.new(source, :none, button) }.to raise_error(TypeError)
+          it 'raises a ArgumentError if invalid direction' do
+            expect { PointerPress.new(source, :none, button) }.to raise_error(ArgumentError)
           end
         end
 
