diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-05-04 23:29:51 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-05 14:14:35 +0200 |
commit | 1a3fbd86c3cf989f131586ed7ddb4bdb9129fd53 (patch) | |
tree | 3c2eb51ff23c46caef3fa7660d7366159f4213cc /tests/auto/qml/qjsengine | |
parent | 3fa15618aec4fc4910d1f34109c5552d718765b5 (diff) |
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>
Diffstat (limited to 'tests/auto/qml/qjsengine')
-rw-r--r-- | tests/auto/qml/qjsengine/tst_qjsengine.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp index 98d69e8d5b..353d01254d 100644 --- 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()); |