Title: [230430] releases/WebKitGTK/webkit-2.20/Tools
Revision
230430
Author
carlo...@webkit.org
Date
2018-04-09 08:46:35 -0700 (Mon, 09 Apr 2018)

Log Message

Merge r230244 - [GTK] Test /webkit/WebKitWebPage/context-menu is failing since r229831
https://bugs.webkit.org/show_bug.cgi?id=184260

Reviewed by Michael Catanzaro.

This is not a regression introduced in r229831, though, it's a bug in the test itself revealed by r229831. We
should wait for the load to complete before trying to show the context menu.

* TestWebKitAPI/Tests/WebKitGtk/TestContextMenu.cpp:
(testContextMenuWebExtensionMenu):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.20/Tools/ChangeLog (230429 => 230430)


--- releases/WebKitGTK/webkit-2.20/Tools/ChangeLog	2018-04-09 15:45:48 UTC (rev 230429)
+++ releases/WebKitGTK/webkit-2.20/Tools/ChangeLog	2018-04-09 15:46:35 UTC (rev 230430)
@@ -1,3 +1,16 @@
+2018-04-03  Carlos Garcia Campos  <cgar...@igalia.com>
+
+        [GTK] Test /webkit/WebKitWebPage/context-menu is failing since r229831
+        https://bugs.webkit.org/show_bug.cgi?id=184260
+
+        Reviewed by Michael Catanzaro.
+
+        This is not a regression introduced in r229831, though, it's a bug in the test itself revealed by r229831. We
+        should wait for the load to complete before trying to show the context menu.
+
+        * TestWebKitAPI/Tests/WebKitGtk/TestContextMenu.cpp:
+        (testContextMenuWebExtensionMenu):
+
 2018-03-22  Adrian Perez de Castro  <ape...@igalia.com>
 
         [WPE] Enable WOFF2 support

Modified: releases/WebKitGTK/webkit-2.20/Tools/TestWebKitAPI/Tests/WebKitGtk/TestContextMenu.cpp (230429 => 230430)


--- releases/WebKitGTK/webkit-2.20/Tools/TestWebKitAPI/Tests/WebKitGtk/TestContextMenu.cpp	2018-04-09 15:45:48 UTC (rev 230429)
+++ releases/WebKitGTK/webkit-2.20/Tools/TestWebKitAPI/Tests/WebKitGtk/TestContextMenu.cpp	2018-04-09 15:46:35 UTC (rev 230430)
@@ -975,6 +975,7 @@
 
     // Custom menu.
     test->loadHtml("<html><body></body></html>", "ContextMenuTestCustom");
+    test->waitUntilLoadFinished();
     test->showContextMenuAndWaitUntilFinished();
     g_assert_cmpuint(test->m_actions.size(), ==, 4);
     g_assert_cmpuint(test->m_actions[0], ==, WEBKIT_CONTEXT_MENU_ACTION_STOP);
@@ -984,6 +985,7 @@
 
     // Menu cleared by the web process.
     test->loadHtml("<html><body></body></html>", "ContextMenuTestClear");
+    test->waitUntilLoadFinished();
     test->showContextMenuAndWaitUntilFinished();
     g_assert_cmpuint(test->m_actions.size(), ==, 0);
 }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to