<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[214347] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/214347">214347</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-24 07:55:59 -0700 (Fri, 24 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed. Fix GTK+ test /webkit2/WebKitWebView/javascript-dialogs after <a href="http://trac.webkit.org/projects/webkit/changeset/214277">r214277</a>.
Since <a href="http://trac.webkit.org/projects/webkit/changeset/214277">r214277</a> beforeunload events are not fired unless there's some user interaction, so we need to simulate it
in our unit tests to work.
* TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp:
(testWebViewJavaScriptDialogs):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkTestUIClientcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (214346 => 214347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-03-24 14:33:52 UTC (rev 214346)
+++ trunk/Tools/ChangeLog 2017-03-24 14:55:59 UTC (rev 214347)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2017-03-24 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ Unreviewed. Fix GTK+ test /webkit2/WebKitWebView/javascript-dialogs after r214277.
+
+ Since r214277 beforeunload events are not fired unless there's some user interaction, so we need to simulate it
+ in our unit tests to work.
+
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp:
+ (testWebViewJavaScriptDialogs):
+
+2017-03-24 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> [GTK] Add MIMETypeRegistry implementation using xdgmime and remove the GTK+ one
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=170001
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestUIClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp (214346 => 214347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp 2017-03-24 14:33:52 UTC (rev 214346)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp 2017-03-24 14:55:59 UTC (rev 214347)
</span><span class="lines">@@ -298,6 +298,15 @@
</span><span class="cx"> return m_mouseTargetHitTestResult.get();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void simulateUserInterqaction()
+ {
+ mouseMoveTo(1, 1);
+ keyStroke(GDK_KEY_Down);
+ keyStroke(GDK_KEY_Up);
+ while (gtk_events_pending())
+ gtk_main_iteration();
+ }
+
</ins><span class="cx"> virtual GtkWidget* viewCreate(WebKitWebView* webView, WebKitNavigationAction* navigation)
</span><span class="cx"> {
</span><span class="cx"> g_assert(webView == m_webView);
</span><span class="lines">@@ -519,6 +528,8 @@
</span><span class="cx">
</span><span class="cx"> static void testWebViewJavaScriptDialogs(UIClientTest* test, gconstpointer)
</span><span class="cx"> {
</span><ins>+ test->showInWindowAndWaitUntilMapped(GTK_WINDOW_TOPLEVEL);
+
</ins><span class="cx"> static const char* htmlOnLoadFormat = "<html><body onLoad=\"%s\"></body></html>";
</span><span class="cx"> static const char* jsAlertFormat = "alert('%s')";
</span><span class="cx"> static const char* jsConfirmFormat = "do { confirmed = confirm('%s'); } while (!confirmed); alert('confirmed');";
</span><span class="lines">@@ -557,6 +568,7 @@
</span><span class="cx">
</span><span class="cx"> // Reload should trigger onbeforeunload.
</span><span class="cx"> #if 0
</span><ins>+ test->simulateUserInterqaction();
</ins><span class="cx"> // FIXME: reloading HTML data doesn't emit finished load event.
</span><span class="cx"> // See https://bugs.webkit.org/show_bug.cgi?id=139089.
</span><span class="cx"> test->m_scriptDialogConfirmed = false;
</span><span class="lines">@@ -566,6 +578,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // Navigation should trigger onbeforeunload.
</span><ins>+ test->simulateUserInterqaction();
</ins><span class="cx"> test->m_scriptDialogConfirmed = false;
</span><span class="cx"> test->loadHtml("<html></html>", nullptr);
</span><span class="cx"> test->waitUntilLoadFinished();
</span><span class="lines">@@ -575,6 +588,7 @@
</span><span class="cx"> test->m_scriptDialogConfirmed = false;
</span><span class="cx"> test->loadHtml(beforeUnloadDialogHTML.get(), nullptr);
</span><span class="cx"> test->waitUntilLoadFinished();
</span><ins>+ test->simulateUserInterqaction();
</ins><span class="cx"> test->tryCloseAndWaitUntilClosed();
</span><span class="cx"> g_assert(test->m_scriptDialogConfirmed);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>