Attachment 340750 Details for Bug 185624 – Patch

[patch] Patch

bug-185624-20180518154807.patch (text/plain), 2.53 KB, created by Sihui Liu on 2018-05-18 15:48:08 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Sihui Liu

Created: 2018-05-18 15:48:08 PDT

Size: 2.53 KB

patch

obsolete

>Subversion Revision: 231984
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index e64ddb8007356cfe3c31ca7bf88af7235df823e0..2c4e51044b0866de2f50c5dcb431bb3473d73f5a 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-05-18  Sihui Liu  <sihui_liu@apple.com>
>+
>+        Flaky API test WebKit.WKHTTPCookieStoreWithoutProcessPool: incorrect order of cookies
>+        https://bugs.webkit.org/show_bug.cgi?id=185624
>+        <rdar://problem/39111626>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Modified expectation to make test more robust as cookies can be returned in different orders.
>+
>+        * TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm:
>+        (-[CookieUIDelegate webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame:completionHandler:]):
>+        (TEST):
>+
> 2018-05-18  Jer Noble  <jer.noble@apple.com>
> 
>         Complete fix for enabling modern EME by default
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm
>index ae13bbb80cb82bf60c50ef05858d9b6883deb336..b9e7a2b81114d53f9e54e4d564141aa7fe0f677a 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm
>+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm
>@@ -33,6 +33,7 @@
> #import <WebKit/WKWebsiteDataStorePrivate.h>
> #import <WebKit/_WKWebsiteDataStoreConfiguration.h>
> #import <wtf/RetainPtr.h>
>+#import <wtf/text/WTFString.h>
> 
> #if WK_API_ENABLED
> 
>@@ -376,7 +377,8 @@ @end
> @implementation CookieUIDelegate
> - (void)webView:(WKWebView *)webView runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(void))completionHandler
> {
>-    EXPECT_STREQ("cookie:PersistentCookieName=CookieValue; SessionCookieName=CookieValue", message.UTF8String);
>+    auto cookies = String(message.UTF8String);
>+    ASSERT_TRUE(cookies == "PersistentCookieName=CookieValue; SessionCookieName=CookieValue" || cookies == "SessionCookieName=CookieValue; PersistentCookieName=CookieValue");
>     finished = true;
>     completionHandler();
> }
>@@ -397,7 +399,7 @@ TEST(WebKit, WKHTTPCookieStoreWithoutProcessPool)
>         NSHTTPCookieDomain: @"127.0.0.1",
>         NSHTTPCookieExpires: [NSDate distantFuture],
>     }];
>-    NSString *alertCookieHTML = @"<script>alert('cookie:'+document.cookie);</script>";
>+    NSString *alertCookieHTML = @"<script>alert(document.cookie);</script>";
> 
>     // NonPersistentDataStore
>     RetainPtr<WKWebsiteDataStore> ephemeralStoreWithCookies = [WKWebsiteDataStore nonPersistentDataStore];

Actions: View | Formatted Diff | Diff

Attachments on bug 185624: 340362 | 340373 | 340403 | 340441 | 340484 | 340746 | 340750