Some fixes to the autotest

Remove an XFAIL that now passes, and some bogus code.

Change-Id: I75ef6e54c5efe30e125003e9f2946f3d4e0533ea
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
index 98d69e8..353d012 100644 (file)
--- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp
+++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
@@ -659,7 +659,6 @@ void tst_QJSEngine::globalObjectWithCustomPrototype()
     global.setPrototype(proto);
     {
         QJSValue ret = engine.evaluate("protoProperty");
-        QEXPECT_FAIL("", "Replacing the prototype of the global object is currently unsupported (see also v8 issue 1078)", Abort);
         QVERIFY(ret.isNumber());
         QVERIFY(ret.strictlyEquals(global.property("protoProperty")));
     }
@@ -669,11 +668,6 @@ void tst_QJSEngine::globalObjectWithCustomPrototype()
         QVERIFY(ret.strictlyEquals(global.property("protoProperty")));
     }
     {
-        QJSValue ret = engine.evaluate("hasOwnProperty('protoProperty')");
-        QVERIFY(ret.isBool());
-        QVERIFY(!ret.toBool());
-    }
-    {
         QJSValue ret = engine.evaluate("this.hasOwnProperty('protoProperty')");
         QVERIFY(ret.isBool());
         QVERIFY(!ret.toBool());