mshtml/tests: Skip some tests if native XMLHTTP support is missing or disabled.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

mshtml/tests: Skip some tests if native XMLHTTP support is missing or disabled.
3cb8e4bd · Nikolay Sivov · Alexandre Julliard · 3e8acbac · 3cb8e4bd · 3cb8e4bd
Commit 3cb8e4bd authored Jan 08, 2018 by Nikolay Sivov Committed by Alexandre Julliard Jan 08, 2018
Show whitespace changes
Inline Side-by-side

Showing with 14 additions and 6 deletions

dom.c dlls/mshtml/tests/dom.c +6 -1

jstest.html dlls/mshtml/tests/jstest.html +8 -5

No files found.
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -6683,7 +6683,12 @@ static void test_xmlhttprequest(IHTMLWindow5 *window)

    hres = IHTMLWindow5_get_XMLHttpRequest(window, &var);
    ok(hres == S_OK, "get_XMLHttpRequest failed: %08x\n", hres);
-    ok(V_VT(&var) == VT_DISPATCH, "expect VT_DISPATCH, got %s\n", debugstr_variant(&var));
+    ok(V_VT(&var) == VT_DISPATCH || broken(V_VT(&var) == VT_EMPTY), "expect VT_DISPATCH, got %s\n", debugstr_variant(&var));
+
+    if (V_VT(&var) == VT_EMPTY) {
+        win_skip("Native XMLHTTP support is missing or disabled.\n");
+        return;
+    }

    factory = NULL;
    hres = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IHTMLXMLHttpRequestFactory, (void**)&factory);

--- a/dlls/mshtml/tests/jstest.html
+++ b/dlls/mshtml/tests/jstest.html
 <html>
 <head>
+<script src="winetest.js" type="text/javascript"></script>
+</head>
+<head>
 <script>
-function ok(b,m) {
-    return external.ok(b, m);
-}
-
 function broken(expr) {
    return external.broken(expr);
 }
@@ -356,7 +355,11 @@ function test_text_node() {

 function test_xhr() {
    ok("XMLHttpRequest" in window, "XMLHttpRequest not found in window object\n");
-    ok(typeof(XMLHttpRequest) === "object", "typeof(XMLHttpRequest) = " + typeof(XMLHttpRequest));
+
+    if (typeof(XMLHttpRequest) != "object") {
+        win_skip("XMLHTTPRequest is not available or disabled");
+        return;
+    }

    var xhr = new XMLHttpRequest();
    ok(typeof(xhr) === "object", "typeof(xhr) = " + typeof(xhr));