diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-15 21:24:23 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-15 21:24:23 +0200 |
commit | 3836fd7d12777fc53836a72d6542d2fbf2f20ac9 (patch) | |
tree | ffd8a3d1c82fea142d7b50fb42111ceb1fbc2e1a /tests/auto/qml/tst_webchannel.qml | |
parent | b84f22a3249aa1af46b17e33ac030abb077251bf (diff) | |
parent | e35346cf70598c47a456946327927643910aa277 (diff) | |
download | qtwebchannel-3836fd7d12777fc53836a72d6542d2fbf2f20ac9.tar.gz |
Merge remote-tracking branch 'origin/5.6' into 5.7
Alleged Conflicts:
examples/webchannel/chatclient-html/doc/src/chatclient-html.qdoc
examples/webchannel/chatclient-qml/doc/src/chatclient-qml.qdoc
examples/webchannel/chatserver-cpp/doc/src/chatserver-cpp.qdoc
In each case, the two sides agreed byte-for-byte.
Not quite sure what git thought the conflict was !
Change-Id: I5da9695b667f4112848c520b630ab1304d61cea3
Diffstat (limited to 'tests/auto/qml/tst_webchannel.qml')
-rw-r--r-- | tests/auto/qml/tst_webchannel.qml | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/tests/auto/qml/tst_webchannel.qml b/tests/auto/qml/tst_webchannel.qml index 403cc4b..5e28db3 100644 --- a/tests/auto/qml/tst_webchannel.qml +++ b/tests/auto/qml/tst_webchannel.qml @@ -46,7 +46,7 @@ TestCase { id: myObj property int myProperty: 1 - signal mySignal(var arg) + signal mySignal(var arg, QtObject object) function myMethod(arg) { @@ -169,9 +169,11 @@ TestCase { function test_signal() { var signalReceivedArg; + var signalReceivedObject; var channel = client.createChannel(function(channel) { - channel.objects.myObj.mySignal.connect(function(arg) { + channel.objects.myObj.mySignal.connect(function(arg, object) { signalReceivedArg = arg; + signalReceivedObject = object; }); }); client.awaitInit(); @@ -182,9 +184,16 @@ TestCase { client.awaitIdle(); // initialization - myObj.mySignal("test"); + myObj.mySignal("test", myObj); compare(signalReceivedArg, "test"); + compare(signalReceivedObject.__id__, "myObj"); + + var newObj = myFactory.create("newObj"); + myObj.mySignal(newObj, newObj); + + compare(signalReceivedArg.objectName, newObj.objectName); + compare(signalReceivedObject.objectName, newObj.objectName); } function test_grouping() @@ -388,14 +397,14 @@ TestCase { client.awaitIdle(); - myObj.mySignal(42); + myObj.mySignal(42, myObj); compare(signalArg, 42); msg = client.awaitMessage(); compare(msg.type, JSClient.QWebChannelMessageTypes.disconnectFromSignal); compare(msg.object, "myObj"); - myObj.mySignal(0); + myObj.mySignal(0, myObj); compare(signalArg, 42); } } |