Merge pull request #109 from MarketSquare/feature/switch-browser-context-page

Feature/switch browser context page

Author: xylix

Browser/keywords/browser_state.py

@@ -59,7 +59,7 @@ def close_browser(self):
             self.info(response.log)
 
     @keyword
-    def new_browser(
+    def create_browser(
         self, browser_type=SupportedBrowsers.chromium, **kwargs,
     ):
         """Create a new playwright Browser with specified options. A Browser is the Playwright object that controls a single Browser process.
@@ -69,13 +69,13 @@ def new_browser(
 
         with self.playwright.grpc_channel() as stub:
             options = json.dumps(kwargs)
-            response = stub.NewBrowser(
-                Request().NewBrowser(browser=browser_type.name, rawOptions=options)
+            response = stub.CreateBrowser(
+                Request().Browser(browser=browser_type.name, rawOptions=options)
             )
             self.info(response.log)
 
     @keyword
-    def new_context(
+    def create_context(
         self, **kwargs,
     ):
         """Create a new BrowserContext with specified options. A BrowserContext is the Playwright object that controls a single browser profile.
@@ -88,33 +88,51 @@ def new_context(
         with self.playwright.grpc_channel() as stub:
             options = json.dumps(kwargs)
             self.info(options)
-            response = stub.NewContext(Request().NewContext(rawOptions=options))
+            response = stub.CreateContext(Request().Context(rawOptions=options))
             self.info(response.log)
 
     @keyword
-    def new_page(self, url: Optional[str] = None):
+    def create_page(self, url: Optional[str] = None):
         """Open a new Page. A Page is the Playwright equivalent to a tab.
 
             If ``url`` parameter is specified will open the new page to the specified URL.
         """
 
         with self.playwright.grpc_channel() as stub:
-            response = stub.NewPage(Request().Url(url=url))
+            response = stub.CreatePage(Request().Url(url=url))
             self.info(response.log)
 
     @keyword
-    def switch_active_page(self, index: int):
+    def switch_page(self, index: int):
         """Switches the active browser page to another open page by ``index``.
 
             Newly opened pages get appended to the end of the list
         """
         with self.playwright.grpc_channel() as stub:
-            response = stub.SwitchActivePage(Request().Index(index=index))
+            response = stub.SwitchPage(Request().Index(index=index))
             self.info(response.log)
 
     @keyword
     def auto_activate_pages(self):
-        """Toggles automatically changing active page to latest opened page """
+        """Toggles automatically changing active page to latest opened page."""
         with self.playwright.grpc_channel() as stub:
             response = stub.AutoActivatePages(Request().Empty())
             self.info(response.log)
+
+    @keyword
+    def switch_browser(self, index: int):
+        """ UNSTABLE AND NOT USE-READY
+
+            Switches the currently active Browser to another open Browser.
+        """
+        with self.playwright.grpc_channel() as stub:
+            response = stub.SwitchBrowser(Request().Index(index=index))
+            self.info(response.log)
+
+    @keyword
+    def switch_context(self, index: int):
+        """ Switches the active BrowserContext to another open context.
+        """
+        with self.playwright.grpc_channel() as stub:
+            response = stub.SwitchContext(Request().Index(index=index))
+            self.info(response.log)

atest/test/01_Browser_Management/goto.robot

@@ -10,7 +10,7 @@ No Open Browser Throws
     Run KeyWord and Expect Error    *details = "Tried to do playwright action 'goto', but no open page."*    GoTo    "about:blank"
 
 Open GoTo GoBack GoForward
-    [Setup]    New Page    ${LOGIN URL}
+    [Setup]    Create Page    ${LOGIN URL}
     Go To    ${WELCOME URL}
     Get Url    ==    ${WELCOME URL}
     Go To    ${ERROR URL}

atest/test/01_Browser_Management/playwright_state.robot

@@ -1,51 +1,64 @@
 *** Settings ***
 Resource          imports.resource
+Suite Setup       No Operation
+Test Setup        No Operation
 Test Teardown     Close Browser
 
 *** Keywords ***
 Open Browser and assert Login Page
     [Arguments]    ${local_browser}
-    New Browser    browser=${local_browser}    headless=${HEADLESS}
-    New Page    url=${LOGIN URL}
+    Open Browser To Login Page
     Get Text    h1    ==    Login Page
 
+Create Page Form
+    Create Page    ${FORM URL}
+    Get Title    ==    prefilled_email_form.html
+
+Create Page Login
+    Create Page    ${LOGIN URL}
+    Get Title    matches    (?i)login
+
 *** Test Cases ***
 Open Firefox
     Open Browser and assert Login Page    firefox
 
 Open Chrome
     Open Browser and assert Login Page    chromium
 
-New Browser does not open a page
-    New Browser
+Create Browser does not open a page
+    Create Browser
     Run Keyword And Expect Error    *"Tried to do playwright action 'goto', but no open page."*    Go To    ${LOGIN URL}
 
-New Browser does not create a context
+Create Browser does not create a context
+    Create Browser
     # Use Switch context to test that no context exists here
-    Pass Execution    Not Implemented yet
-    [Teardown]    Pass Execution    Not Implemented yet
-    Switch Context
+    Run Keyword And Expect Error    *No context for index 0.*    Switch Context    0
 
-New Context does not open a page
-    New Context
+Create Context does not open a page
+    Create Context
     Run Keyword And Expect Error    *"Tried to do playwright action 'goto', but no open page."*    Go To    ${LOGIN URL}
 
 Switch Browser
-    Pass Execution    Not Implemented yet
-    [Teardown]    Pass Execution    Not Implemented yet
-    New Browser    chromium
-    New Browser    firefox
-    Switch Browser
+    Create Browser    chromium
+    Pass Execution    Switch Browser doesn't work yet
+    Create Page Login
+    Create Browser    firefox
+    Create Page Form
+    Switch Browser    0
+    Get Title    matches    (?i)login
 
 Switch Context
-    Pass Execution    Not Implemented yet
-    [Teardown]    Pass Execution    Not Implemented yet
-    New Context
-    New Context
-    Switch Context
+    Create Context
+    Create Page    ${LOGIN URL}
+    Get Title    matches    (?i)login
+    Create Context
+    Create Page    ${FORM URL}
+    Get Title    ==    prefilled_email_form.html
+    Switch Context    0
+    Get Title    matches    (?i)login
 
-New Page can create context and browser
-    New Page    ${LOGIN URL}
+Create Page can create context and browser
+    Create Page    ${LOGIN URL}
     Get Text    h1    ==    Login Page
 
 Focus Next Page on popup
@@ -56,10 +69,10 @@ Focus Next Page on popup
     Sleep    1s
     Wait For Elements State    "Popped Up!"
 
-Switch Active Page after popup
+Switch Page after popup
     Open Browser and assert Login Page    chromium
     Click    button#pops_up
-    Switch Active Page    1
+    Switch Page    1
     Wait For Elements State    "Popped Up!"
-    Switch Active Page    0
+    Switch Page    0
     Wait For Elements State    button#pops_up

atest/test/02_Content_Keywords/__init__.robot

@@ -1,4 +1,4 @@
 *** Settings ***
 Resource          imports.resource
-Suite Setup       Run Keywords    New Browser    browser=${BROWSER}    headless=${HEADLESS}    AND    New Page
+Suite Setup       Open Browser To no page
 Suite Teardown    Close Browser

atest/test/02_Content_Keywords/basic-getters.robot

@@ -1,6 +1,6 @@
 *** Settings ***
 Resource          imports.resource
-Suite Setup       Go To    ${LOGIN URL}
+Test Setup        Create Page    ${LOGIN URL}
 
 *** Variables ***
 ${UserNameLabel}=    label[for="username_field"]

atest/test/02_Content_Keywords/checkbox.robot

@@ -1,6 +1,6 @@
 *** Settings ***
 Resource          imports.resource
-Suite Setup       New Page    ${FORM_URL}
+Test Setup        Create Page    ${FORM_URL}
 
 *** Test Cases ***
 Get Checkbox State Checked

atest/test/02_Content_Keywords/click.robot

@@ -1,6 +1,6 @@
 *** Settings ***
 Resource          imports.resource
-Test Setup        New Page    ${LOGIN URL}
+Test Setup        Create Page    ${LOGIN URL}
 
 *** Test Cases ***
 Click Button

atest/test/02_Content_Keywords/invalid_assertions.robot

@@ -1,6 +1,6 @@
 *** Settings ***
 Resource          imports.resource
-Suite Setup       New Page    ${LOGIN URL}
+Test Setup        Create Page    ${LOGIN URL}
 
 *** Test Cases ***
 Invalids will raise error directly from Robot Framework

atest/test/02_Content_Keywords/keypress.robot

@@ -1,6 +1,6 @@
 *** Settings ***
 Resource          imports.resource
-Suite Setup       New Page    ${FORM_URL}
+Test Setup        Create Page    ${FORM URL}
 
 *** Test Cases ***
 Press Keys Generate Characters

atest/test/02_Content_Keywords/screenshot.robot

@@ -1,6 +1,6 @@
 *** Settings ***
 Resource          imports.resource
-Suite Setup       New Page    ${LOGIN URL}
+Test Setup        Create Page    ${LOGIN URL}
 
 *** Variables ***
 ${failure_screnshot}    ${OUTPUT_DIR}${/}Test_screenshotting_failing_test_FAILURE_SCREENSHOT.png

atest/test/02_Content_Keywords/select-lists.robot

@@ -1,6 +1,6 @@
 *** Settings ***
 Resource          imports.resource
-Suite Setup       New Page    ${FORM_URL}
+Test Setup        Create Page    ${FORM URL}
 Test Timeout      10s
 
 *** Test Cases ***

atest/test/02_Content_Keywords/text_keywords.robot

@@ -1,6 +1,6 @@
 *** Settings ***
 Resource          imports.resource
-Suite Setup       Go To    ${LOGIN URL}
+Test Setup        Create Page    ${LOGIN URL}
 
 *** Test Cases ***
 Type Text with Clearing

atest/test/02_Content_Keywords/title_should_be.robot

@@ -3,9 +3,9 @@ Resource          imports.resource
 
 *** Test Cases ***
 test server title
-    Go To    ${LOGIN URL}/
+    Create Page    ${LOGIN URL}/
     Get Title    ==    Login Page
 
 about:blank title
-    Go To    about:blank
+    Create Page    about:blank
     Get Title    ==    ${EMPTY}

atest/test/03_Waiting/__init__.robot

@@ -1,4 +1,4 @@
 *** Settings ***
 Resource          imports.resource
-Suite Setup       Run Keywords    New Browser    browser=${BROWSER}    headless=${HEADLESS}    AND    New Page
+Suite Setup       Open Browser To No Page
 Suite Teardown    Close Browser

atest/test/03_Waiting/wait_for_element_state.robot

@@ -1,6 +1,7 @@
 *** Settings ***
 Resource          imports.resource
-Test Setup        New Page    ${LOGIN URL}
+Suite Setup       Open Browser To No Page
+Test Setup        Create Page    ${LOGIN URL}
 
 *** Test Cases ***
 Wait For Elements State to hide

atest/test/keywords.resource

@@ -7,14 +7,20 @@ Resource          variables.resource
 ${PLAYWRIGHT TIMEOUT}      1 second
 
 *** Keywords ***
+Open Browser To No Page
+    Create Browser  ${BROWSER}  headless=${HEADLESS}
+
 Open Browser To Frame Page
-    New Browser  ${BROWSER}  headless=${HEADLESS}
-    New Page  ${FRAMES URL}
+    Create Browser  ${BROWSER}  headless=${HEADLESS}
+    Create Page  ${FRAMES URL}
 
+Open Browser To Form Page
+    Create Browser  ${BROWSER}  headless=${HEADLESS}
+    Create Page  ${FORM_URL}
 
 Open Browser To Login Page
-    New Browser  ${BROWSER}  headless=${HEADLESS}
-    New Page  ${LOGIN URL}
+    Create Browser  ${BROWSER}  headless=${HEADLESS}
+    Create Page  ${LOGIN URL}    
     # Set Selenium Speed    ${DELAY}
     Login Page Should Be Open
 

atest/test/on_page_js.robot

@@ -1,7 +1,7 @@
 *** Settings ***
 Library           Browser
 Resource          keywords.resource
-Test Setup        New Page    ${LOGIN URL}
+Test Setup        Create Page    ${LOGIN URL}
 Test Teardown     Close Browser
 
 *** Test Cases ***

docs/Browser.html

@@ -14,4 +14,4 @@ module.exports = {
       // Place to specify ESLint rules. Can be used to overwrite rules specified from the extended configs
       // e.g. "@typescript-eslint/explicit-function-return-type": "off",
     }
-  };
+  };