Fix rest of the test to expect correct error message

MarketSquare · Dec 1, 2022 · 16e931f · 16e931f
1 parent 5c93c1e
commit 16e931f
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 21 deletions.
diff --git a/atest/test/02_Content_Keywords/basic_getters.robot b/atest/test/02_Content_Keywords/basic_getters.robot
@@ -33,7 +33,9 @@ Get Text Assert Validate
 Get Text With Nonmatching Selector
     [Tags]    no-iframe
     Set Browser Timeout    50ms
-    Run Keyword And Expect Error    *Timeout 50ms exceeded.*waiting for selector "notamatch"*    Get Text    notamatch
+    Run Keyword And Expect Error
+    ...    *TimeoutError: locator.elementHandle: Timeout 50ms exceeded.*waiting for locator('notamatch')*
+    ...    Get Text    notamatch
     [Teardown]    Set Browser Timeout    ${PLAYWRIGHT_TIMEOUT}
 
 Get Property And Assert

diff --git a/atest/test/02_Content_Keywords/basic_getters_expect_errors.robot b/atest/test/02_Content_Keywords/basic_getters_expect_errors.robot
@@ -220,8 +220,9 @@ Get Property Custom Error
 Get Property With Nonmatching Selector
     [Tags]    no-iframe
     [Setup]    Set Browser Timeout    50ms
-    Run Keyword And Expect Error    *Timeout 50ms exceeded.*waiting for selector "notamatch"*    Get Property
-    ...    notamatch    attributeName
+    Run Keyword And Expect Error
+    ...    *TimeoutError: locator.elementHandle: Timeout 50ms exceeded.*waiting for locator('notamatch')*
+    ...    Get Property    notamatch    attributeName
     [Teardown]    Set Browser Timeout    ${PLAYWRIGHT_TIMEOUT}
 
 Get Attribute With Strict

diff --git a/atest/test/02_Content_Keywords/checkbox.robot b/atest/test/02_Content_Keywords/checkbox.robot
@@ -79,7 +79,8 @@ Uncheck Checkbox With Strict
 Get Checkbox State With Nonmatching Selector
     [Tags]    no-iframe
     Set Browser Timeout    50ms
-    Run Keyword And Expect Error    *Timeout 50ms exceeded.*waiting for selector "xpath=//notamatch"*
+    Run Keyword And Expect Error
+    ...    *TimeoutError: locator.elementHandle: Timeout 50ms exceeded.*waiting for locator('xpath=//notamatch')*
     ...    Get Checkbox State    xpath=//notamatch
     [Teardown]    Set Browser Timeout    ${PLAYWRIGHT_TIMEOUT}
 

diff --git a/atest/test/02_Content_Keywords/click.robot b/atest/test/02_Content_Keywords/click.robot
@@ -12,8 +12,9 @@ Click Button
 Click Nonmatching Selector
     [Tags]    no-iframe
     ${originaltimeout} =    Set Browser Timeout    50ms
-    Run Keyword And Expect Error    *Timeout 50ms exceeded.*waiting for selector "css=notamatch"*    Click
-    ...    css=notamatch
+    Run Keyword And Expect Error
+    ...    *TimeoutError: locator.click: Timeout 50ms exceeded.*waiting for locator('notamatch')*
+    ...    Click    css=notamatch
     [Teardown]    Set Browser Timeout    ${originaltimeout}
 
 Click With Invalid Selector

diff --git a/atest/test/02_Content_Keywords/keypress.robot b/atest/test/02_Content_Keywords/keypress.robot
@@ -31,6 +31,7 @@ Press Keys Combination Of Keystrokes In Select List
 Press Keys With Nonmatching Selector
     [Tags]    no-iframe
     Set Browser Timeout    50ms
-    Run Keyword And Expect Error    *Timeout 50ms exceeded.*waiting for selector "css=notamatch"*    Press Keys
-    ...    css=notamatch    F
+    Run Keyword And Expect Error
+    ...    *TimeoutError: locator.press: Timeout 50ms exceeded.*waiting for locator('notamatch')*
+    ...    Press Keys    css=notamatch    F
     [Teardown]    Set Browser Timeout    ${PLAYWRIGHT_TIMEOUT}
diff --git a/atest/test/02_Content_Keywords/screenshot.robot b/atest/test/02_Content_Keywords/screenshot.robot
@@ -65,9 +65,8 @@ Screenshotting With Jpeg Extension And Quality Borders
 If Element Not Found Screenshot Should Fail
     ${timeout} =    Set Browser Timeout    200ms
     Run Keyword And Expect Error
-    ...    TimeoutError: locator.screenshot: Timeout 200ms exceeded.*waiting for selector "${SELECTOR_PREFIX_WAITING}#not_there"*
-    ...    Take Screenshot
-    ...    selector=\#not_there
+    ...    *TimeoutError: locator.screenshot: Timeout 200ms exceeded.*waiting for locator('#not_there')*
+    ...    Take Screenshot    selector=\#not_there
     Set Browser Timeout    ${timeout}
     [Teardown]    Remove File    ${OUTPUT_DIR}/*.png
 

diff --git a/atest/test/02_Content_Keywords/select_lists.robot b/atest/test/02_Content_Keywords/select_lists.robot
@@ -71,8 +71,9 @@ Get Selected Options With Xpath
 Get Selected Options With Nonmatching Selector
     [Tags]    no-iframe
     Set Browser Timeout    50ms
-    Run Keyword And Expect Error    *Timeout 50ms exceeded.*waiting for selector "notamatch"*    Get Selected Options
-    ...    notamatch
+    Run Keyword And Expect Error
+    ...    *TimeoutError: locator.elementHandle: Timeout 50ms exceeded.*waiting for locator('notamatch')*
+    ...    Get Selected Options    notamatch
     [Teardown]    Set Browser Timeout    ${PLAYWRIGHT_TIMEOUT}
 
 Select Option By Label
@@ -98,7 +99,8 @@ Select Options By Text
 Select Options By With Nonmatching Selector
     [Tags]    no-iframe
     Set Browser Timeout    50ms
-    Run Keyword And Expect Error    *Timeout 50ms exceeded.*waiting for selector "notamatch"*
+    Run Keyword And Expect Error
+    ...    *TimeoutError: locator.selectOption: Timeout 50ms exceeded.*waiting for locator('notamatch')*
     ...    Select Options By
     ...    notamatch    label    False    Label
     [Teardown]    Set Browser Timeout    ${PLAYWRIGHT_TIMEOUT}
@@ -158,8 +160,9 @@ Deselect Options With Strict
 Deselect Options With Nonmatching Selector
     [Tags]    no-iframe
     Set Browser Timeout    50ms
-    Run Keyword And Expect Error    *Timeout 50ms exceeded.*waiting for selector "notamatch"*    Deselect Options
-    ...    notamatch
+    Run Keyword And Expect Error
+    ...    *TimeoutError: locator.selectOption: Timeout 50ms exceeded.*waiting for locator('notamatch')*
+    ...    Deselect Options    notamatch
     [Teardown]    Set Browser Timeout    ${PLAYWRIGHT_TIMEOUT}
 
 *** Keywords ***

diff --git a/atest/test/02_Content_Keywords/text_keywords.robot b/atest/test/02_Content_Keywords/text_keywords.robot
@@ -16,7 +16,7 @@ Type Text With Nonmatching Selector
     [Tags]    no-iframe
     Set Browser Timeout    50ms
     Run Keyword And Expect Error
-    ...    *Timeout 50ms exceeded.*waiting for selector "notamatch"*
+    ...    *    TimeoutError: locator.fill: Timeout 50ms exceeded.*waiting For Locator('notamatch')*
     ...    Type Text    notamatch    text
     [Teardown]    Set Browser Timeout    ${PLAYWRIGHT_TIMEOUT}
 
@@ -40,7 +40,7 @@ Clear Text With Nonmatching Selector
     [Tags]    no-iframe
     Set Browser Timeout    50ms
     Run Keyword And Expect Error
-    ...    *Timeout 50ms exceeded.*waiting for selector "notamatch"*
+    ...    *TimeoutError: locator.fill: Timeout 50ms exceeded.*waiting for locator('notamatch')*
     ...    Clear Text    notamatch
     [Teardown]    Set Browser Timeout    ${PLAYWRIGHT_TIMEOUT}
 
@@ -56,7 +56,7 @@ Fill Text With Nonmatching Selector
     [Tags]    no-iframe
     Set Browser Timeout    50ms
     Run Keyword And Expect Error
-    ...    *Timeout 50ms exceeded.*waiting for selector "notamatch"*
+    ...    *TimeoutError: locator.fill: Timeout 50ms exceeded.*waiting for locator('notamatch')*
     ...    Fill Text    notamatch    text
     [Teardown]    Set Browser Timeout    ${PLAYWRIGHT_TIMEOUT}
 
@@ -221,8 +221,9 @@ Fill Secret With Nonmatching Selector
     [Tags]    no-iframe
     Set Environment Variable    MY_RFBROWSER_SECRET    secret
     Set Browser Timeout    50ms
-    Run Keyword And Expect Error    *Timeout 50ms exceeded.*waiting for selector "notamatch"*    Fill Secret
-    ...    notamatch    %MY_RFBROWSER_SECRET
+    Run Keyword And Expect Error
+    ...    *TimeoutError: locator.fill: Timeout 50ms exceeded.*waiting for locator('notamatch')*
+    ...    Fill Secret    notamatch    %MY_RFBROWSER_SECRET
     [Teardown]    Set Browser Timeout    ${PLAYWRIGHT_TIMEOUT}
 
 Type Text With Delay