From f1e4575a46aaac271271b8e5f1361b6a658ea5e0 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Campos Date: Wed, 4 Apr 2018 06:00:58 +0000 Subject: [PATCH] [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): Canonical link: https://commits.webkit.org/199841@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@230244 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Tools/ChangeLog | 13 +++++++++++++ .../Tests/WebKitGtk/TestContextMenu.cpp | 2 ++ 2 files changed, 15 insertions(+) diff --git a/Tools/ChangeLog b/Tools/ChangeLog index 571cd81f8f20..2831e11bf910 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,16 @@ +2018-04-03 Carlos Garcia Campos + + [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-04-03 Zalan Bujtas [LayoutReloaded] Introduce floating to InlineFormattingContext diff --git a/Tools/TestWebKitAPI/Tests/WebKitGtk/TestContextMenu.cpp b/Tools/TestWebKitAPI/Tests/WebKitGtk/TestContextMenu.cpp index 7bd709719a70..d93d5b244dfd 100644 --- a/Tools/TestWebKitAPI/Tests/WebKitGtk/TestContextMenu.cpp +++ b/Tools/TestWebKitAPI/Tests/WebKitGtk/TestContextMenu.cpp @@ -975,6 +975,7 @@ static void testContextMenuWebExtensionMenu(ContextMenuWebExtensionTest* test, g // Custom menu. test->loadHtml("", "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 @@ static void testContextMenuWebExtensionMenu(ContextMenuWebExtensionTest* test, g // Menu cleared by the web process. test->loadHtml("", "ContextMenuTestClear"); + test->waitUntilLoadFinished(); test->showContextMenuAndWaitUntilFinished(); g_assert_cmpuint(test->m_actions.size(), ==, 0); }