Title: [231508] trunk/Tools
Revision
231508
Author
[email protected]
Date
2018-05-08 13:16:44 -0700 (Tue, 08 May 2018)

Log Message

[iOS] WKAttachmentTestsIOS.InsertDroppedItemProvidersInOrder fails after r231396
https://bugs.webkit.org/show_bug.cgi?id=185414

Reviewed by Tim Horton.

Adjust a test expectation to check that the resulting DOM contains an attachment element,
anchor element, and another attachment element in that order. This ensures that the test
still passes, even after the anchor element is followed by a line break.

* TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm:
(TestWebKitAPI::TEST):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (231507 => 231508)


--- trunk/Tools/ChangeLog	2018-05-08 20:12:24 UTC (rev 231507)
+++ trunk/Tools/ChangeLog	2018-05-08 20:16:44 UTC (rev 231508)
@@ -1,3 +1,17 @@
+2018-05-08  Wenson Hsieh  <[email protected]>
+
+        [iOS] WKAttachmentTestsIOS.InsertDroppedItemProvidersInOrder fails after r231396
+        https://bugs.webkit.org/show_bug.cgi?id=185414
+
+        Reviewed by Tim Horton.
+
+        Adjust a test expectation to check that the resulting DOM contains an attachment element,
+        anchor element, and another attachment element in that order. This ensures that the test
+        still passes, even after the anchor element is followed by a line break.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm:
+        (TestWebKitAPI::TEST):
+
 2018-05-08  Commit Queue  <[email protected]>
 
         Unreviewed, rolling out r231491.

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm (231507 => 231508)


--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm	2018-05-08 20:12:24 UTC (rev 231507)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm	2018-05-08 20:16:44 UTC (rev 231508)
@@ -1338,11 +1338,7 @@
             NSLog(@"Error: %@", error);
     }
 
-    NSArray *observedElementTags = (NSArray *)[webView objectByEvaluatingJavaScript:@"Array.from(document.body.children).map(e => e.tagName)"];
-    NSArray *expectedElementTags = @[ @"ATTACHMENT", @"A", @"ATTACHMENT" ];
-    EXPECT_TRUE([observedElementTags isEqualToArray:expectedElementTags]);
-    if (![observedElementTags isEqualToArray:expectedElementTags])
-        NSLog(@"Observed elements: %@ did not match expectations: %@", observedElementTags, expectedElementTags);
+    [webView expectElementTagsInOrder:@[ @"ATTACHMENT", @"A", @"ATTACHMENT" ]];
 
     EXPECT_WK_STREQ("first.txt", [webView stringByEvaluatingJavaScript:@"document.querySelectorAll('attachment')[0].getAttribute('title')"]);
     EXPECT_WK_STREQ("text/plain", [webView stringByEvaluatingJavaScript:@"document.querySelectorAll('attachment')[0].getAttribute('type')"]);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to