[rb] raise error if input device not found

titusfortner · titusfortner · commit 2fd9d1a01151 · 2021-12-01T00:15:26.000-06:00
diff --git a/rb/lib/selenium/webdriver/common/action_builder.rb b/rb/lib/selenium/webdriver/common/action_builder.rb
@@ -92,7 +92,7 @@ def add_key_input(name)
       #
 
       def get_device(name)
-        @devices.find { |device| device.name == name.to_s }
+        @devices.find { |device| device.name == name.to_s } || raise(ArgumentError, "Can not find device: #{name}")
       end
 
       #
diff --git a/rb/lib/selenium/webdriver/common/interactions/key_actions.rb b/rb/lib/selenium/webdriver/common/interactions/key_actions.rb
@@ -134,12 +134,17 @@ def send_keys(*args, device: nil)
       #
 
       def key_action(*args, action: nil, device: nil)
-        key_input = get_device(device) || key_inputs.first
+        key_input = key_input(device)
         click(args.shift) if args.first.is_a? Element
         key_input.send(action, args.last)
         tick(key_input)
         self
       end
+
+      def key_input(device = nil)
+        device ? get_device(device) : key_inputs.first
+      end
+
     end # KeyActions
   end # WebDriver
 end # Selenium
diff --git a/rb/lib/selenium/webdriver/common/interactions/pointer_actions.rb b/rb/lib/selenium/webdriver/common/interactions/pointer_actions.rb
@@ -96,7 +96,7 @@ def pointer_up(button, device: nil)
       #
 
       def move_to(element, right_by = nil, down_by = nil, device: nil)
-        pointer = get_pointer(device)
+        pointer = pointer_input(device)
         # New actions offset is from center of element
         if right_by || down_by
           size = element.size
@@ -134,7 +134,7 @@ def move_to(element, right_by = nil, down_by = nil, device: nil)
       #
 
       def move_by(right_by, down_by, device: nil)
-        pointer = get_pointer(device)
+        pointer = pointer_input(device)
         pointer.create_pointer_move(duration: default_move_duration,
                                     x: Integer(right_by),
                                     y: Integer(down_by),
@@ -161,7 +161,7 @@ def move_by(right_by, down_by, device: nil)
       #
 
       def move_to_location(x, y, device: nil)
-        pointer = get_pointer(device)
+        pointer = pointer_input(device)
         pointer.create_pointer_move(duration: default_move_duration,
                                     x: Integer(x),
                                     y: Integer(y),
@@ -349,14 +349,14 @@ def drag_and_drop_by(source, right_by, down_by, device: nil)
       private
 
       def button_action(button, action: nil, device: nil)
-        pointer = get_pointer(device)
+        pointer = pointer_input(device)
         pointer.send(action, button)
         tick(pointer)
         self
       end
 
-      def get_pointer(device = nil)
-        get_device(device) || pointer_inputs.first
+      def pointer_input(device = nil)
+        device ? get_device(device) : pointer_inputs.first
       end
     end # PointerActions
   end # WebDriver
diff --git a/rb/spec/unit/selenium/webdriver/common/interactions/key_actions_spec.rb b/rb/spec/unit/selenium/webdriver/common/interactions/key_actions_spec.rb
@@ -35,6 +35,10 @@ module WebDriver
           expect(builder.send(:key_input, keyboard.name)).to eq keyboard
         end
 
+        it 'raises ArgumentError if no device exists with that name' do
+          expect { builder.send(:key_input, 'none') }.to raise_error(ArgumentError)
+        end
+
         it 'gets default key input' do
           expect(builder.send(:key_input)).to eq keyboard
         end
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
@@ -36,6 +36,10 @@ module WebDriver
           expect(builder.send(:pointer_input, mouse.name)).to eq mouse
         end
 
+        it 'raises ArgumentError if no device exists with that name' do
+          expect { builder.send(:pointer_input, 'none') }.to raise_error(ArgumentError)
+        end
+
         it 'gets default key input' do
           expect(builder.send(:pointer_input)).to eq mouse
         end

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ def add_key_input(name)`
`92`	`92`	`#`
`93`	`93`
`94`	`94`	`def get_device(name)`
`95`		`- @devices.find { \|device\| device.name == name.to_s }`
	`95`	`+ @devices.find { \|device\| device.name == name.to_s } \|\| raise(ArgumentError, "Can not find device: #{name}")`
`96`	`96`	`end`
`97`	`97`
`98`	`98`	`#`