Web Automation: cookies returned by automation should have expiry time in seconds

carlosgcampos · carlosgcampos · commit e4c1bf97d7b9 · 2018-01-31T09:09:45.000Z
https://bugs.webkit.org/show_bug.cgi?id=182293 Reviewed by Brian Burg. When creating a WebCore::Cookie from a WebDriver object we convert the given expiry time to milliseconds, but when creating a WebDriver object from a WebCore::Cookie we are keeping the milliseconds. We should convert to seconds for consistency, so that the WebDriver always handles seconds. Fixes: imported/w3c/webdriver/tests/cookies/get_named_cookie.py::test_get_named_cookie * UIProcess/Automation/WebAutomationSession.cpp: (WebKit::buildObjectForCookie): Convert expiry to seconds. Canonical link: https://commits.webkit.org/198130@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@227891 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
@@ -1,3 +1,19 @@
+2018-01-31  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Web Automation: cookies returned by automation should have expiry time in seconds
+        https://bugs.webkit.org/show_bug.cgi?id=182293
+
+        Reviewed by Brian Burg.
+
+        When creating a WebCore::Cookie from a WebDriver object we convert the given expiry time to milliseconds, but
+        when creating a WebDriver object from a WebCore::Cookie we are keeping the milliseconds. We should convert to
+        seconds for consistency, so that the WebDriver always handles seconds.
+
+        Fixes: imported/w3c/webdriver/tests/cookies/get_named_cookie.py::test_get_named_cookie
+
+        * UIProcess/Automation/WebAutomationSession.cpp:
+        (WebKit::buildObjectForCookie): Convert expiry to seconds.
+
 2018-01-31  Ryosuke Niwa  <rniwa@webkit.org>
 
         Unreviewed iOS build fix.
diff --git a/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp b/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp
@@ -1122,7 +1122,7 @@ static Ref<Inspector::Protocol::Automation::Cookie> buildObjectForCookie(const W
         .setValue(cookie.value)
         .setDomain(cookie.domain)
         .setPath(cookie.path)
-        .setExpires(cookie.expires)
+        .setExpires(cookie.expires ? cookie.expires / 1000 : 0)
         .setSize((cookie.name.length() + cookie.value.length()))
         .setHttpOnly(cookie.httpOnly)
         .setSecure(cookie.secure)
