Click button with modifier

Author: aaltat

atest/acceptance/keywords/click_element_modifier.robot

@@ -13,6 +13,10 @@ Click Link Modifier CTRL
     Element Text Should Be    output    CTRL click
     [Teardown]    Close Popup Window
 
+Click Button Modifier CTRL
+    Click Button    Click me!    modifier=CTRL
+    Element Text Should Be    output    CTRL click
+
 Click Element Modifier ALT
     Click Element    Button    alt
     Element Text Should Be    output    ALT click

src/SeleniumLibrary/keywords/element.py

@@ -507,18 +507,26 @@ def get_vertical_position(self, locator):
         return self.find_element(locator).location['y']
 
     @keyword
-    def click_button(self, locator):
+    def click_button(self, locator, modifier=False):
         """Clicks button identified by ``locator``.
 
         See the `Locating elements` section for details about the locator
         syntax. When using the default locator strategy, buttons are
         searched using ``id``, ``name`` and ``value``.
+
+        See the `Click Element` keyword for details about the
+        ``modifier`` argument.
+
+        The ``modifier`` argument is new in SeleniumLibrary 3.3
         """
-        self.info("Clicking button '%s'." % locator)
-        element = self.find_element(locator, tag='input', required=False)
-        if not element:
-            element = self.find_element(locator, tag='button')
-        element.click()
+        if is_falsy(modifier):
+            self.info("Clicking button '%s'." % locator)
+            element = self.find_element(locator, tag='input', required=False)
+            if not element:
+                element = self.find_element(locator, tag='button')
+            element.click()
+        else:
+            self._click_with_modifier(locator, 'button', modifier)
 
     @keyword
     def click_image(self, locator):
@@ -584,7 +592,7 @@ def click_element(self, locator, modifier=False):
             self._click_with_modifier(locator, None, modifier)
 
     def _click_with_modifier(self, locator, tag, modifier):
-        self.info("Clicking element '%s' with %s." % (locator, modifier))
+        self.info("Clicking %s '%s' with %s." % (tag if tag else 'element', locator, modifier))
         modifier = self.parse_modifier(modifier)
         action = ActionChains(self.driver)
         for item in modifier: