Merge branch 'master' into issue-1768

atest/acceptance/2-event_firing_webdriver/event_firing_webdriver.robot

@@ -12,8 +12,8 @@ ${event_firing_or_none}     ${NONE}
 Open Browser To Start Page
     [Tags]    NoGrid
     [Documentation]
-    ...    LOG 1:16 DEBUG  Wrapping driver to event_firing_webdriver.
-    ...    LOG 1:18 INFO  Got driver also from SeleniumLibrary.
+    ...    LOG 1:20 DEBUG  Wrapping driver to event_firing_webdriver.
+    ...    LOG 1:22 INFO  Got driver also from SeleniumLibrary.
     Open Browser    ${FRONT PAGE}    ${BROWSER}    remote_url=${REMOTE_URL}
     ...    desired_capabilities=${DESIRED_CAPABILITIES}
 

atest/acceptance/keywords/__init__.robot

@@ -1,4 +1,4 @@
 *** Settings ***
 Resource    ../resource.robot
-Suite Setup    Open Browser To Start Page
+Suite Setup    Open Browser To Start Page    keywords
 Suite Teardown    Close All Browsers

atest/acceptance/keywords/click_element.robot

@@ -40,7 +40,7 @@ Click Element Action Chain
     [Tags]    NoGrid
     [Documentation]
     ...    LOB 1:1 INFO        Clicking 'singleClickButton' using an action chain.
-    ...    LOG 1:7 DEBUG GLOB: *actions {"actions": [{*
+    ...    LOG 1:6 DEBUG GLOB: *actions {"actions": [{*
     Click Element    singleClickButton      action_chain=True
     Element Text Should Be    output    single clicked
 

atest/acceptance/keywords/content_assertions.robot

@@ -27,6 +27,18 @@ Page Should Contain
     Page Should Contain    This is the haystack
     Page Should Contain    non existing text
 
+Page Should Contain Using Default Custom Log Level
+    [Tags]    NoGrid
+    [Documentation]    The Page Should Contains using default custom log level (that being
+    ...    'TRACE' - noting the excluded second argument for the `Page Should Contain`
+    ...    keyword) fails and the log contains the html content.
+    ...    FAIL Page should have contained text 'non existing text' but did not.
+    ...    LOG 2:19 TRACE REGEXP: (?i)<html.*</html>
+    ...    LOG 2:20 FAIL Page should have contained text 'non existing text' but did not.
+    ${old_level}=  Set Log Level    TRACE
+    Page Should Contain    non existing text
+    [Teardown]    Set Log Level    ${old_level}
+
 Page Should Contain Numbers And String Should Be Same
     Log Source
     Page Should Contain    1
@@ -37,24 +49,56 @@ Page Should Contain With Text Having Internal Elements
     Go to page "links.html"
     Page Should Contain    Relative with text after
 
+Page Should Contain With Custom Log Level INFO
+    [Tags]    NoGrid
+    [Documentation]    Html content is shown at the explicitly specified INFO level.
+    ...    FAIL Page should have contained text 'non existing text' but did not.
+    ...    LOG 1:18 INFO REGEXP: (?i)<html.*</html>
+    ...    LOG 1:19 FAIL Page should have contained text 'non existing text' but did not.
+    Page Should Contain    non existing text    INFO
+
+Page Should Contain With Custom Log Level WARN
+    [Tags]    NoGrid
+    [Documentation]    Html content is shown at the explicitly specified WARN level.
+    ...    FAIL Page should have contained text 'non existing text' but did not.
+    ...    LOG 1:18 WARN REGEXP: (?i)<html.*</html>
+    ...    LOG 1:19 FAIL Page should have contained text 'non existing text' but did not.
+    Page Should Contain    non existing text    WARN
+
 Page Should Contain With Custom Log Level DEBUG
     [Tags]    NoGrid
-    [Documentation]    Html content is shown at DEBUG level.
+    [Documentation]    Html content is shown at the explicitly specified DEBUG level.
     ...    FAIL Page should have contained text 'non existing text' but did not.
     ...    LOG 1:18 DEBUG REGEXP: (?i)<html.*</html>
     ...    LOG 1:19 FAIL Page should have contained text 'non existing text' but did not.
     Page Should Contain    non existing text    DEBUG
 
 Page Should Contain With Custom Log Level TRACE
     [Tags]    NoGrid
-    [Documentation]    Html content is shown at DEBUG level.
+    [Documentation]    Html content is shown at the explicitly specified TRACE level.
     ...    FAIL Page should have contained text 'non existing text' but did not.
     ...    LOG 2:19 TRACE REGEXP: (?i)<html.*</html>
     ...    LOG 2:20 FAIL Page should have contained text 'non existing text' but did not.
     Set Log Level    TRACE
     Page Should Contain    non existing text    TRACE
     [Teardown]    Set Log Level    DEBUG
 
+Page Should Contain With Custom Log Level NONE
+    [Tags]    NoGrid
+    [Documentation]    Html content is not shown because the loglevel is set to NONE.
+    ...    FAIL Page should have contained text 'non existing text' but did not.
+    ...    LOG 1:18 FAIL Page should have contained text 'non existing text' but did not.
+    Page Should Contain    non existing text    NONE
+
+Page Should Contain With Custom Log Level Below Current Log Level
+    [Tags]    NoGrid
+    [Documentation]    Html content is not shown when custom log level is below curent log level.
+    ...    FAIL Page should have contained text 'non existing text' but did not.
+    ...    LOG 2:18 FAIL Page should have contained text 'non existing text' but did not.
+    ${old_level}=  Set Log Level    DEBUG
+    Page Should Contain    non existing text    TRACE
+    [Teardown]    Set Log Level    ${old_level}
+
 Page Should Contain With Disabling Source Logging
     [Documentation]    LOG TEARDOWN:2 NONE
     Set Log Level    INFO

atest/acceptance/keywords/cookies.robot

@@ -113,6 +113,7 @@ Test Get Cookie Keyword Logging
     ...    secure=False
     ...    httpOnly=False
     ...    expiry=2023-10-29 19:36:51
+    ...    extra={'sameSite': 'Lax'}
     ${cookie} =    Get Cookie     another
 
 *** Keyword ***