Add element upload file (#38)

* Add element upload file

* Enhance wait for new window open keyword

* Fix unstable wait for new window open

* Fix script failed based on update keyword

Author: atthaboon

Examples/browser-demo.robot

@@ -11,8 +11,9 @@ Example switch window and check window title
     Maximize Browser Window
     ${title} =   Get title
     ${location} =   Get location
+    ${window count} =    Get Window Count
     Run Async Keywords
-    ...    Wait for new window open    AND
+    ...    Wait for new window open    ${window count}    5s    AND
     ...    Click Element    id=readdocs
     Switch Window   NEW
     ${Title} =   Get Title

Examples/file-upload.robot

@@ -0,0 +1,20 @@
+*** Settings ***
+Library    PuppeteerLibrary    
+Test Setup    Open browser to test page    
+Test Teardown    Close Browser
+
+
+*** Variables ***
+${HOME_PAGE_URL}    http://127.0.0.1:7272/file-upload.html
+
+
+*** Test Cases ***
+Upload file demo
+    Upload file    id=fileToUpload    ${CURDIR}/quick-start.robot
+
+
+*** Keywords ***
+Open browser to test page
+    ${HEADLESS}     Get variable value    ${HEADLESS}    ${False}
+    &{options} =    create dictionary   headless=${HEADLESS}
+    Open browser    ${HOME_PAGE_URL}   options=${options}

Examples/generate-pdf-demo.robot

@@ -10,6 +10,7 @@ ${HOME_PAGE_URL}    http://127.0.0.1:7272
 
 *** Test Cases ***
 Generate pdf file
+    [Documentation]    Only support on headless mode
     Print as pdf    
 
 *** Keywords ***

Examples/timeout-demo.robot

@@ -11,13 +11,14 @@ ${HOME_PAGE_URL}    http://127.0.0.1:7272
 *** Test Cases ***
 Set default timeout
     Set Timeout    3s
-    Run Keyword And Expect Error    No new page has been open.*    Wait for new window open
+    ${window count} =    Get Window Count
+    Run Keyword And Expect Error    No new page has been open.*    Wait for new window open    ${window count}
 
 Timeout wait for new window open
-    Run Keyword And Expect Error    No new page has been open.*    Wait for new window open    1s
-    Click Element    id:readdocs
-    Wait for new window open    5s
-    
+    ${window count} =    Get Window Count
+    Run Async Keywords
+    ...    Wait for new window open    ${window count}    5s    AND    
+    ...    Click Element    id:readdocs
 
 *** Keywords ***
 Open test browser

PuppeteerLibrary/keywords/browsermanagement.py

@@ -158,7 +158,13 @@ def set_timeout(self, timeout):
         return orig_timeout
 
     @keyword
-    def wait_for_new_window_open(self, timeout=None):
+    def get_window_count(self):
+        """ Get windows count
+        """
+        return  self.loop.run_until_complete(self.async_func.get_window_count_async())
+
+    @keyword
+    def wait_for_new_window_open(self, current_page_count=1, timeout=None):
         """
         Waits until new page or tab opens.
 
@@ -167,7 +173,7 @@ def wait_for_new_window_open(self, timeout=None):
         | Run Async Keywords | Click Element              | id:view_conditions          | AND  |
         | ...                | `Wait For New Window Open` |                             |      |
         """
-        self.loop.run_until_complete(self.async_func.wait_for_new_window_open_async(timeout))
+        self.loop.run_until_complete(self.async_func.wait_for_new_window_open_async(current_page_count, timeout))
 
     @keyword
     def switch_window(self, locator='MAIN'):

PuppeteerLibrary/keywords/browsermanagement_async.py

@@ -7,16 +7,20 @@
 class BrowserManagementKeywordsAsync(LibraryComponent):
 
     @keyword
-    async def wait_for_new_window_open_async(self, timeout=None):
-        timeout = self.timestr_to_secs_for_default_timeout(timeout)
+    async def get_window_count_async(self):
         pages = await self.ctx.get_browser().pages()
-        await pages[-1].title()  # workaround for force pages re-cache
-        pre_page_len = len(pages)
+        for page in pages:
+            await page.title()  # workaround for force pages re-cache
+        return len(await self.ctx.get_browser().pages())
+
+    @keyword
+    async def wait_for_new_window_open_async(self, current_page_count=1, timeout=None):
+        page_len = 0
+        pre_page_len = int(current_page_count)
+        timeout = self.timestr_to_secs_for_default_timeout(timeout)
         timer = 0
         while timer < timeout:
-            pages = await self.ctx.get_browser().pages()
-            await pages[-1].title()  # workaround for force pages re-cache
-            page_len = len(pages)
+            page_len = await self.get_window_count_async()
             if page_len > pre_page_len:
                 return
             timer += 1

PuppeteerLibrary/keywords/element.py

@@ -124,3 +124,9 @@ def element_text_should_not_be(self, locator, expected, ignore_case=False):
 
         """
         return self.loop.run_until_complete(self.async_func.element_text_should_not_be_async(locator, expected, ignore_case))
+
+    @keyword
+    def upload_file(self, locator, file_path):
+        """ Upload file
+        """
+        return self.loop.run_until_complete(self.async_func.upload_file_async(locator, file_path))

PuppeteerLibrary/keywords/element_async.py

@@ -96,3 +96,8 @@ async def element_text_should_be_async(self, selenium_locator, expected, ignore_
     async def element_text_should_not_be_async(self, selenium_locator, expected, ignore_case=False):
         text = await self.get_text_async(selenium_locator)
         return BuiltIn().should_not_be_equal_as_strings(text, expected, ignore_case=ignore_case)
+
+    @keyword
+    async def upload_file_async(self, selenium_locator, file_path):
+        element = await self.ctx.get_current_page().querySelector_with_selenium_locator(selenium_locator)
+        await element.uploadFile(file_path)

demoapp/html/file-upload.html

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+    <div class="container">
+    <form method="post" enctype="multipart/form-data">
+      Select image to upload:
+      <input type="file" name="fileToUpload" id="fileToUpload">
+      <input type="submit" value="Upload Image" name="submit">
+    </form>
+  </div>
+</body>
+</html>

demoapp/html/index.html

@@ -38,7 +38,8 @@
       </div>
     </div>
   </div>
-  <div id="container">
+
+  <div id="container" class="container">
     <h1>Login Page</h1>
       <p>Please input your user name and password and click the login button.</p>
       <form name="login_form" onsubmit="login(this.username_field.value, this.password_field.value); return false;">