Merge branch 'latest-versions-sept2024' into latest-versions-oct2024

emanlove · Nov 1, 2024 · 9b58690 · 9b58690
2 parents 8fbabb8 + c508836
commit 9b58690
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -87,7 +87,7 @@ jobs:
     #     sudo chmod u+x ./selenium-server-standalone.jar
     #     xvfb-run --auto-servernum python atest/run.py --zip headlesschrome  --grid True
 
-    - uses: actions/upload-artifact@v1
+    - uses: actions/upload-artifact@v3
       if: failure()
       with:
         name: SeleniumLibrary Test results

diff --git a/atest/acceptance/keywords/cookies.robot b/atest/acceptance/keywords/cookies.robot
@@ -36,15 +36,15 @@ Add Cookie When Secure Is False
     Should Be Equal    ${cookie.secure}       ${False}
 
 Add Cookie When Expiry Is Epoch
-    Add Cookie    Cookie1    value1    expiry=1730205247
+    Add Cookie    Cookie1    value1    expiry=1761755100
     ${cookie} =    Get Cookie    Cookie1
-    ${expiry} =    Convert Date    ${1730205247}    exclude_millis=True
+    ${expiry} =    Convert Date    ${1761755100}    exclude_millis=True
     Should Be Equal As Strings    ${cookie.expiry}    ${expiry}
 
 Add Cookie When Expiry Is Human Readable Data&Time
-    Add Cookie    Cookie12    value12    expiry=2024-10-29 19:36:51
+    Add Cookie    Cookie12    value12    expiry=2025-10-29 12:25:00
     ${cookie} =    Get Cookie    Cookie12
-    Should Be Equal As Strings    ${cookie.expiry}    2024-10-29 19:36:51
+    Should Be Equal As Strings    ${cookie.expiry}    2025-10-29 12:25:00
 
 Delete Cookie
     [Tags]    Known Issue Safari
@@ -114,17 +114,20 @@ Test Get Cookie Keyword Logging
     ...    domain=localhost
     ...    secure=False
     ...    httpOnly=False
-    ...    expiry=2024-09-15 *:22:33
+    ...    expiry=2025-09-01 *:25:00
     ...    extra={'sameSite': 'Lax'}
     ${cookie} =    Get Cookie     far_future
 
 *** Keywords ***
 Add Cookies
+    # To update time each September (as Chrome limits cookies to one year expiry date) use
+    #    import datetime
+    #    print (datetime.datetime.strptime("2025-09-01 12:25:00", "%Y-%m-%d %I:%M:%S").timestamp())
     Delete All Cookies
     Add Cookie    test       seleniumlibrary
     ${now} =    Get Current Date
     ${tomorrow_thistime} =    Add Time To Date    ${now}    1 day
     ${tomorrow_thistime_datetime} =    Convert Date    ${tomorrow_thistime}    datetime
     Set Suite Variable    ${tomorrow_thistime_datetime}
     Add Cookie    another    value   expiry=${tomorrow_thistime}
-    Add Cookie    far_future    timemachine    expiry=1726399353    # 2024-09-15 11:22:33
+    Add Cookie    far_future    timemachine    expiry=1756700700    # 2025-09-01 12:25:00