Attachment 341464 Details for Bug 185831 – Patch

[patch] Patch

bug-185831-20180528190837.patch (text/plain), 2.44 KB, created by Sihui Liu on 2018-05-28 19:08:37 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Sihui Liu

Created: 2018-05-28 19:08:37 PDT

Size: 2.44 KB

patch

obsolete

>Subversion Revision: 232250
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index ab7261f1a377c362039757370ea4d9f33b2d1423..a71afabe21c79adb011a5b83e09298441def60aa 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-05-28  Sihui Liu  <sihui_liu@apple.com>
>+
>+        [iOS] TestWebKitAPI.WebKit.WKHTTPCookieStoreWithoutProcessPool fails because cookies use different files with/without processpool
>+        https://bugs.webkit.org/show_bug.cgi?id=185831
>+        <rdar://problem/40468716>
>+
>+        Reviewed by David Kilzer.
>+
>+        * TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm:
>+        (-[CookieUIDelegate webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame:completionHandler:]):
>+        (TEST):
>+
> 2018-05-28  Thibault Saunier  <tsaunier@igalia.com>
> 
>         [GStreamer] Handle changes in the "drm-preferred-decryption-system-id" NEED_CONTEXT message.
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm
>index 8f94b34d6d03a85cab77ad7ec71878389e90467f..afe43ed4e586472259915ce4170eddaafd9d1f59 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm
>+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm
>@@ -432,8 +432,7 @@ @end
> @implementation CookieUIDelegate
> - (void)webView:(WKWebView *)webView runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(void))completionHandler
> {
>-    auto cookies = String(message.UTF8String);
>-    EXPECT_TRUE(cookies == "PersistentCookieName=CookieValue; SessionCookieName=CookieValue" || cookies == "SessionCookieName=CookieValue; PersistentCookieName=CookieValue");
>+    EXPECT_STREQ("PersistentCookieName=CookieValue; SessionCookieName=CookieValue", message.UTF8String);
>     finished = true;
>     completionHandler();
> }
>@@ -454,7 +453,7 @@ TEST(WebKit, WKHTTPCookieStoreWithoutProcessPool)
>         NSHTTPCookieDomain: @"127.0.0.1",
>         NSHTTPCookieExpires: [NSDate distantFuture],
>     }];
>-    NSString *alertCookieHTML = @"<script>alert(document.cookie);</script>";
>+    NSString *alertCookieHTML = @"<script>var cookies = document.cookie.split(';'); for (let i = 0; i < cookies.length; i ++) { cookies[i] = cookies[i].trim(); } cookies.sort(); alert(cookies.join('; '));</script>";
> 
>     // NonPersistentDataStore
>     RetainPtr<WKWebsiteDataStore> ephemeralStoreWithCookies = [WKWebsiteDataStore nonPersistentDataStore];

Actions: View | Formatted Diff | Diff

Attachments on bug 185831: 340990 | 341206 | 341464