Click Link with modifier

Author: aaltat

atest/acceptance/keywords/click_element_modifier.robot

@@ -8,6 +8,11 @@ Click Element Modifier CTRL
     Click Element    Button    modifier=CTRL
     Element Text Should Be    output    CTRL click
 
+Click Link Modifier CTRL
+    Click Link    link text    modifier=CTRL
+    Element Text Should Be    output    CTRL click
+    [Teardown]    Close Popup Window
+
 Click Element Modifier ALT
     Click Element    Button    alt
     Element Text Should Be    output    ALT click
@@ -33,3 +38,8 @@ Click Element Wrong Modifier
 Initialize Page
     Reload Page
     Element Text Should Be    output    initial output
+
+Close Popup Window
+    Select Window    myName    timeout=5s
+    Close Window
+    Select Window    MAIN      timeout=5s

src/SeleniumLibrary/keywords/element.py

@@ -536,15 +536,23 @@ def click_image(self, locator):
         element.click()
 
     @keyword
-    def click_link(self, locator):
+    def click_link(self, locator, modifier=False):
         """Clicks a link identified by ``locator``.
 
         See the `Locating elements` section for details about the locator
         syntax. When using the default locator strategy, links are searched
         using ``id``, ``name``, ``href`` and the link text.
+
+        See the `Click Element` keyword for details about the
+        ``modifier`` argument.
+
+        The ``modifier`` argument is new in SeleniumLibrary 3.3
         """
-        self.info("Clicking link '%s'." % locator)
-        self.find_element(locator, tag='link').click()
+        if is_falsy(modifier):
+            self.info("Clicking link '%s'." % locator)
+            self.find_element(locator, tag='link').click()
+        else:
+            self._click_with_modifier(locator, 'link', modifier)
 
     @keyword
     def click_element(self, locator, modifier=False):
@@ -573,14 +581,15 @@ def click_element(self, locator, modifier=False):
             self.info("Clicking element '%s'." % locator)
             self.find_element(locator).click()
         else:
-            self._click_with_modifier(locator, modifier)
+            self._click_with_modifier(locator, None, modifier)
 
-    def _click_with_modifier(self, locator, modifier):
+    def _click_with_modifier(self, locator, tag, modifier):
+        self.info("Clicking element '%s' with %s." % (locator, modifier))
         modifier = self.parse_modifier(modifier)
         action = ActionChains(self.driver)
         for item in modifier:
             action.key_down(item)
-        action.click(self.find_element(locator))
+        action.click(self.find_element(locator, tag=tag))
         for item in modifier:
             action.key_up(item)
         action.perform()