Changeset 206304 in webkit

Timestamp:

Sep 23, 2016 8:48:22 AM (8 years ago)

Author:

Carlos Garcia Campos

Message:

REGRESSION(r204163): [GTK] API test /webkit2/WebKitSecurityManager/file-xhr is failing
​https://bugs.webkit.org/show_bug.cgi?id=161607

Reviewed by Michael Catanzaro.

Since r204163, in case of cross origin error when loading the XHR, the load fails and an error message is shown
in the console, but there isn't any js expcetion, which is what we were checking. Now, we check that there
aren't exceptions, and that the error message is sent to the console.

• Scripts/run-gtk-tests:

(TestRunner):

• TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp:

(consoleMessageReceivedCallback):
(testWebContextSecurityFileXHR):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/run-gtk-tests (modified) (1 diff)
• TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2016-09-23  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        REGRESSION(r204163): [GTK] API test /webkit2/WebKitSecurityManager/file-xhr is failing
+        https://bugs.webkit.org/show_bug.cgi?id=161607
+
+        Reviewed by Michael Catanzaro.
+
+        Since r204163, in case of cross origin error when loading the XHR, the load fails and an error message is shown
+        in the console, but there isn't any js expcetion, which is what we were checking. Now, we check that there
+        aren't exceptions, and that the error message is sent to the console.
+
+        * Scripts/run-gtk-tests:
+        (TestRunner):
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp:
+        (consoleMessageReceivedCallback):
+        (testWebContextSecurityFileXHR):
+
 2016-09-23  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Tools/Scripts/run-gtk-tests

@@ -79 +79 @@
         SkippedTest("WebKit2Gtk/TestWebViewEditor", "/webkit2/WebKitWebView/select-all/editable", "Test hits assertion", 161608),
         SkippedTest("WebKit2Gtk/TestWebExtensions", "/webkit2/WebKitWebView/install-missing-plugins-permission-request", "Test times out", 147822),
-        SkippedTest("WebKit2Gtk/TestWebKitWebContext", "/webkit2/WebKitSecurityManager/file-xhr", "Test hits assertion", 161607),
         SkippedTest("WebKit2/TestWebKit2", "WebKit2.MouseMoveAfterCrash", "Test is flaky", 85066),
         SkippedTest("WebKit2/TestWebKit2", "WebKit2.NewFirstVisuallyNonEmptyLayoutForImages", "Test is flaky", 85066),

trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp

@@ -628 +628 @@
 }
 
+static void consoleMessageReceivedCallback(WebKitUserContentManager*, WebKitJavascriptResult* message, WebKitJavascriptResult** result)
+{
+    g_assert(result);
+    g_assert(!*result);
+    *result = webkit_javascript_result_ref(message);
+}
+
 static void testWebContextSecurityFileXHR(WebViewTest* test, gconstpointer)
 {
@@ -637 +644 @@
     GUniquePtr<char> xhr(g_strdup_printf("var xhr = new XMLHttpRequest; xhr.open(\"GET\", \"%s\"); xhr.send();", jsonURL.get()));
 
-    // By default file access is not allowed, this will fail with a cross-origin error.
+    WebKitJavascriptResult* consoleMessage = nullptr;
+    webkit_user_content_manager_register_script_message_handler(test->m_userContentManager.get(), "console");
+    g_signal_connect(test->m_userContentManager.get(), "script-message-received::console", G_CALLBACK(consoleMessageReceivedCallback), &consoleMessage);
+
+    // By default file access is not allowed, this will show a console message with a cross-origin error.
     GUniqueOutPtr<GError> error;
     WebKitJavascriptResult* javascriptResult = test->runJavaScriptAndWaitUntilFinished(xhr.get(), &error.outPtr());
-    g_assert(!javascriptResult);
-    g_assert_error(error.get(), WEBKIT_JAVASCRIPT_ERROR, WEBKIT_JAVASCRIPT_ERROR_SCRIPT_FAILED);
+    g_assert(javascriptResult);
+    g_assert(!error);
+    g_assert(consoleMessage);
+    GUniquePtr<char> messageString(WebViewTest::javascriptResultToCString(consoleMessage));
+    GRefPtr<GVariant> variant = g_variant_parse(G_VARIANT_TYPE("(uusus)"), messageString.get(), nullptr, nullptr, nullptr);
+    g_assert(variant.get());
+    unsigned level;
+    const char* messageText;
+    g_variant_get(variant.get(), "(uu&su&s)", nullptr, &level, &messageText, nullptr, nullptr);
+    g_assert_cmpuint(level, ==, 3); // Console error message.
+    GUniquePtr<char> expectedErrorMessage(g_strdup_printf("XMLHttpRequest cannot load %s. Cross origin requests are only supported for HTTP.", jsonURL.get()));
+    g_assert_cmpstr(messageText, ==, expectedErrorMessage.get());
+    webkit_javascript_result_unref(consoleMessage);
+    consoleMessage = nullptr;
+    level = 0;
+    messageText = nullptr;
+    variant = nullptr;
 
     // Allow file access from file URLs.
@@ -655 +681 @@
     test->waitUntilLoadFinished();
     javascriptResult = test->runJavaScriptAndWaitUntilFinished(xhr.get(), &error.outPtr());
-    g_assert(!javascriptResult);
-    g_assert_error(error.get(), WEBKIT_JAVASCRIPT_ERROR, WEBKIT_JAVASCRIPT_ERROR_SCRIPT_FAILED);
+    g_assert(javascriptResult);
+    g_assert(!error);
+    g_assert(consoleMessage);
+    variant = g_variant_parse(G_VARIANT_TYPE("(uusus)"), messageString.get(), nullptr, nullptr, nullptr);
+    g_assert(variant.get());
+    g_variant_get(variant.get(), "(uu&su&s)", nullptr, &level, &messageText, nullptr, nullptr);
+    g_assert_cmpuint(level, ==, 3); // Console error message.
+    g_assert_cmpstr(messageText, ==, expectedErrorMessage.get());
+    webkit_javascript_result_unref(consoleMessage);
+
+    g_signal_handlers_disconnect_matched(test->m_userContentManager.get(), G_SIGNAL_MATCH_DATA, 0, 0, nullptr, nullptr, &consoleMessage);
+    webkit_user_content_manager_unregister_script_message_handler(test->m_userContentManager.get(), "console");
 
     webkit_settings_set_allow_file_access_from_file_urls(webkit_web_view_get_settings(test->m_webView), FALSE);