Add missing click keywords (#64)

* Fix missing webkit wait for fading
* Add skip verify after click
* Add missing click link
* Fix missing click link button and image keywords
* Fix error missing default params
* Update playwright to 0.152.0
* Fix parsing error

Author: atthaboon

Examples/form-handler/click-element.robot

@@ -8,13 +8,24 @@ ${DEFAULT_BROWSER}    chrome
 
 
 *** Test Cases ***
+Click link
+    Open browser to test page    http://127.0.0.1:7272/basic-html-elements.html
+    Click Link    id=goto-login-page
+    
+Click Button
+    Open browser to test page    http://127.0.0.1:7272/basic-html-elements.html
+    Click Button    id=get_ajax
+    
+Click Image
+    Open browser to test page    http://127.0.0.1:7272/basic-html-elements.html
+    Click Image    id=gate
+
 Click element at coordiator
     Open browser to test page    http://127.0.0.1:7272/login-form-example.html
     Run Async Keywords
     ...    Wait For New Window Open    AND
     ...    Click Element At Coordinate    css=button[type="submit"]    1    1
 
-
 *** Keywords ***
 Open browser to test page
     [Arguments]    ${url}

Examples/form-handler/form-submit.robot

@@ -4,7 +4,7 @@ Test Teardown    Close All Browser
 Suite Teardown    Close Puppeteer
 
 *** Variables ***
-${DEFAULT_BROWSER}    chrome
+${DEFAULT_BROWSER}    webkit
 
 
 *** Test Cases ***
@@ -28,7 +28,18 @@ Submit register form
     Select From List By Value    id=inputState    5
     Input Text    id=inputZip    1234
     Click Element    css=button[type="submit"]
-    
+
+Webkit demo skip wait after click
+    [Tags]    Ignore
+    Open browser to test page    https://www.w3schools.com/html/html_forms.asp
+    Wait Until Element Is Visible    id=fname
+    Input Text     id=fname     123
+    Input Text     id=lname     321
+    Run Async Keywords
+    ...    Wait For New Window Open    AND
+    ...    Click Element     xpath=(//input[@value="Submit"])[1]    ${True}
+    Switch Window    NEW
+    Wait Until Page Contains    Submitted Form Data
 
 *** Keywords ***
 Open browser to test page

PuppeteerLibrary/ikeywords/ielement_async.py

@@ -15,7 +15,19 @@ async def find_elements(self, locator: str):
     # Action
     ##############################
     @abstractmethod
-    async def click_element(self, locator: str):
+    async def click_element(self, locator: str, noWaitAfter: str='False'):
+        pass
+
+    @abstractmethod
+    async def click_link(self, locator: str):
+        pass
+
+    @abstractmethod
+    async def click_button(self, locator: str):
+        pass
+
+    @abstractmethod
+    async def click_image(self, locator: str):
         pass
 
     @abstractmethod

PuppeteerLibrary/keywords/element.py

@@ -1,4 +1,3 @@
-from typing import NamedTuple, Optional
 from PuppeteerLibrary.base.robotlibcore import keyword
 from PuppeteerLibrary.base.librarycomponent import LibraryComponent
 from PuppeteerLibrary.ikeywords.ielement_async import iElementAsync
@@ -16,14 +15,21 @@ def get_async_keyword_group(self) -> iElementAsync:
     # Action
     ##############################
     @keyword
-    def click_element(self, locator):
+    def click_element(self, locator, noWaitAfter='False'):
         """Clicks element identified by ``locator``.
 
+        The ``noWaitAfter`` argument specifies skip wait for animation after click.
+        Only support for webkit and safari (Puppeteer)
+
         Example:
 
-        | `Click Element`                                  | id:register          |
+        | `Click Element`         | id:register          |            |
+        | `Click Element`         | id:register          | ${True}    |
         """
-        self.loop.run_until_complete(self.get_async_keyword_group().click_element(locator))
+        self.loop.run_until_complete(self.get_async_keyword_group().click_element(
+            locator=locator, 
+            noWaitAfter=noWaitAfter
+        ))
 
     @keyword
     def click_link(self, locator):

PuppeteerLibrary/playwright/async_keywords/playwright_element.py

@@ -1,3 +1,4 @@
+from PuppeteerLibrary.utils.coverter import str2bool
 from robot.libraries.BuiltIn import BuiltIn
 from PuppeteerLibrary.ikeywords.ielement_async import iElementAsync
 
@@ -16,15 +17,37 @@ async def find_elements(self, locator: str):
     ##############################
     # Click
     ##############################
-    async def click_element(self, locator: str):
-        return await self.library_ctx.get_current_page().click_with_selenium_locator(locator)
+    async def click_element(self, locator: str, noWaitAfter: str='False'):
+        noWaitAfter = str2bool(noWaitAfter)
+        element = await self.library_ctx.get_current_page().querySelector_with_selenium_locator(locator)
+        await element.click(
+            noWaitAfter=noWaitAfter
+        )
+
+    async def click_link(self, locator: str):
+        await self._click_with_specific_tag(locator,'a')
+
+    async def click_button(self, locator: str):
+        await self._click_with_specific_tag(locator,'button')
+
+    async def click_image(self, locator: str):
+        await self._click_with_specific_tag(locator,'img')
+
+    async def _click_with_specific_tag(self, locator: str, expect_tag_name: str):
+        elements = await self.library_ctx.get_current_page().querySelectorAll_with_selenium_locator(locator)
+        for element in elements:
+            tag_name = await (await element.getProperty('tagName')).jsonValue()
+            if tag_name.lower() == expect_tag_name:
+                return await element.click()
+        raise Exception('Can\'t find the specific '+ expect_tag_name +' element for '+locator)
 
     async def click_element_at_coordinate(self, locator: str, xoffset: str, yoffset: str):
         element = await self.library_ctx.get_current_page().querySelector_with_selenium_locator(locator)
-        await element.click(position={
-            'x': int(xoffset),
-            'y': int(yoffset)
-        })
+        await element.click(
+            position={
+                'x': int(xoffset),
+                'y': int(yoffset)
+            })
 
     async def upload_file(self, locator: str, file_path: str):
         element = await self.library_ctx.get_current_page().querySelector_with_selenium_locator(locator)

PuppeteerLibrary/playwright/async_keywords/playwright_waiting.py

@@ -117,6 +117,7 @@ async def validate_is_enabled():
     async def wait_until_element_finished_animating(self, locator, timeout=None):
         prev_rect_tmp = { 'value': None }
         async def check_finished_animating():
+            await self.wait_until_element_is_visible(locator)
             element = await self.library_ctx.get_current_page().querySelector_with_selenium_locator(locator)
             if prev_rect_tmp['value'] is None:
                 prev_rect_tmp['value'] = await element.boundingBox()

PuppeteerLibrary/puppeteer/async_keywords/puppeteer_element.py

@@ -1,3 +1,4 @@
+from PuppeteerLibrary.utils.coverter import str2bool
 from typing import Optional
 from robot.libraries.BuiltIn import BuiltIn
 from PuppeteerLibrary.ikeywords.ielement_async import iElementAsync
@@ -17,8 +18,26 @@ async def find_elements(self, locator: str):
     ##############################
     # Click
     ##############################
-    async def click_element(self, locator: str):
-        return await self.library_ctx.get_current_page().click_with_selenium_locator(locator)
+    async def click_element(self, locator: str, noWaitAfter: str='False'):
+        element = await self.library_ctx.get_current_page().querySelector_with_selenium_locator(locator)
+        await element.click()
+
+    async def click_link(self, locator: str):
+        await self._click_with_specific_tag(locator,'a')
+
+    async def click_button(self, locator: str):
+        await self._click_with_specific_tag(locator,'button')
+
+    async def click_image(self, locator: str):
+        await self._click_with_specific_tag(locator,'img')
+
+    async def _click_with_specific_tag(self, locator: str, expect_tag_name: str):
+        elements = await self.library_ctx.get_current_page().querySelectorAll_with_selenium_locator(locator)
+        for element in elements:
+            tag_name = await (await element.getProperty('tagName')).jsonValue()
+            if tag_name.lower() == expect_tag_name:
+                return await element.click()
+        raise Exception('Can\'t find the specific '+ expect_tag_name +' element for '+locator)
 
     async def click_element_at_coordinate(self, locator: str, xoffset: str, yoffset: str):
         element = await self.library_ctx.get_current_page().querySelector_with_selenium_locator(locator)

PuppeteerLibrary/utils/coverter.py

@@ -0,0 +1,6 @@
+def str2bool(v):
+    if v == True:
+        return True
+    elif v == False:
+        return False
+    return v.lower() in ("yes", "true", "1")

requirements.txt

@@ -1,6 +1,6 @@
 versioneer>=0.18
 robotframework>=3.2.1
-playwright==0.151.0
+playwright==0.152.0
 # pyppeteer>=0.2.2
 git+https://github.com/qahive/pyppeteer.git@dev2
 robotframework-libdoc2json>=0.4

setup.py

@@ -39,7 +39,7 @@
     platforms='any',
     install_requires=[
         'robotframework>=3.2.1',
-        'playwright>=0.151.0',
+        'playwright>=0.152.0',
         'pyppeteer>=0.2.2',
     ],
     # python_requires='>3.5',