Code refactoring

Author: aaltat

src/SeleniumLibrary/keywords/element.py

@@ -506,6 +506,46 @@ def get_vertical_position(self, locator):
         """
         return self.find_element(locator).location['y']
 
+    @keyword
+    def click_button(self, locator):
+        """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``.
+        """
+        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()
+
+    @keyword
+    def click_image(self, locator):
+        """Clicks an image identified by ``locator``.
+
+        See the `Locating elements` section for details about the locator
+        syntax. When using the default locator strategy, images are searched
+        using ``id``, ``name``, ``src`` and ``alt``.
+        """
+        self.info("Clicking image '%s'." % locator)
+        element = self.find_element(locator, tag='image', required=False)
+        if not element:
+            # A form may have an image as it's submit trigger.
+            element = self.find_element(locator, tag='input')
+        element.click()
+
+    @keyword
+    def click_link(self, locator):
+        """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.
+        """
+        self.info("Clicking link '%s'." % locator)
+        self.find_element(locator, tag='link').click()
+
     @keyword
     def click_element(self, locator, modifier=False):
         """Click element identified by ``locator``.
@@ -533,14 +573,17 @@ def click_element(self, locator, modifier=False):
             self.info("Clicking element '%s'." % locator)
             self.find_element(locator).click()
         else:
-            modifier = self.parse_modifier(modifier)
-            action = ActionChains(self.driver)
-            for item in modifier:
-                action.key_down(item)
-            action.click(self.find_element(locator))
-            for item in modifier:
-                action.key_up(item)
-            action.perform()
+            self._click_with_modifier(locator, modifier)
+
+    def _click_with_modifier(self, 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))
+        for item in modifier:
+            action.key_up(item)
+        action.perform()
 
     @keyword
     def click_element_at_coordinates(self, locator, xoffset, yoffset):
@@ -832,17 +875,6 @@ def _press_keys_special_keys(self, actions, element, parsed_key, key, special_ke
             special_keys.append(key)
         return special_keys
 
-    @keyword
-    def click_link(self, locator):
-        """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.
-        """
-        self.info("Clicking link '%s'." % locator)
-        self.find_element(locator, tag='link').click()
-
     @keyword
     def get_all_links(self):
         """Returns a list containing ids of all links found in current page.
@@ -890,21 +922,6 @@ def page_should_not_contain_link(self, locator, message=None, loglevel='TRACE'):
         """
         self.assert_page_not_contains(locator, 'link', message, loglevel)
 
-    @keyword
-    def click_image(self, locator):
-        """Clicks an image identified by ``locator``.
-
-        See the `Locating elements` section for details about the locator
-        syntax. When using the default locator strategy, images are searched
-        using ``id``, ``name``, ``src`` and ``alt``.
-        """
-        self.info("Clicking image '%s'." % locator)
-        element = self.find_element(locator, tag='image', required=False)
-        if not element:
-            # A form may have an image as it's submit trigger.
-            element = self.find_element(locator, tag='input')
-        element.click()
-
     @keyword
     def mouse_down_on_image(self, locator):
         """Simulates a mouse down event on an image identified by ``locator``.

src/SeleniumLibrary/keywords/formelement.py

@@ -339,20 +339,6 @@ def textarea_value_should_be(self, locator, expected, message=None):
             raise AssertionError(message)
         self.info("Content of text area '%s' is '%s'." % (locator, expected))
 
-    @keyword
-    def click_button(self, locator):
-        """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``.
-        """
-        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()
-
     @keyword
     def page_should_contain_button(self, locator, message=None, loglevel='TRACE'):
         """Verifies button ``locator`` is found from current page.