2 files changed, 38 insertions, 4 deletions

diff --git a/tests/auto/webchannel/tst_webchannel.cpp b/tests/auto/webchannel/tst_webchannel.cpp
index 55723ea..2ab820b 100644
--- a/tests/auto/webchannel/tst_webchannel.cpp
+++ b/tests/auto/webchannel/tst_webchannel.cpp
@@ -376,6 +376,12 @@ void TestWebChannel::testInfoForObject()
         }
         {
             QJsonArray method;
+            method.append(QStringLiteral("fire"));
+            method.append(obj.metaObject()->indexOfMethod("fire()"));
+            expected.append(method);
+        }
+        {
+            QJsonArray method;
             method.append(QStringLiteral("method1"));
             method.append(obj.metaObject()->indexOfMethod("method1()"));
             expected.append(method);
@@ -403,6 +409,12 @@ void TestWebChannel::testInfoForObject()
             signal.append(obj.metaObject()->indexOfMethod("sig2(QString)"));
             expected.append(signal);
         }
+        {
+            QJsonArray signal;
+            signal.append(QStringLiteral("replay"));
+            signal.append(obj.metaObject()->indexOfMethod("replay()"));
+            expected.append(signal);
+        }
         QCOMPARE(info["signals"].toArray(), expected);
     }
 
@@ -735,10 +747,30 @@ void TestWebChannel::testAsyncObject()
     int method = obj.metaObject()->indexOfMethod("setProp(QString)");
     QVERIFY(method != -1);
 
-    QSignalSpy spy(&obj, &TestObject::propChanged);
-    channel.d_func()->publisher->invokeMethod(&obj, method, args);
-    QVERIFY(spy.wait());
-    QCOMPARE(spy.at(0).at(0).toString(), args.at(0).toString());
+    {
+        QSignalSpy spy(&obj, &TestObject::propChanged);
+        channel.d_func()->publisher->invokeMethod(&obj, method, args);
+        QVERIFY(spy.wait());
+        QCOMPARE(spy.at(0).at(0).toString(), args.at(0).toString());
+    }
+
+    channel.registerObject("myObj", &obj);
+    channel.d_func()->publisher->initializeClient(m_dummyTransport);
+
+    QJsonObject connectMessage;
+    connectMessage["type"] = 7;
+    connectMessage["object"] = "myObj";
+    connectMessage["signal"] = obj.metaObject()->indexOfSignal("replay()");
+    channel.d_func()->publisher->handleMessage(connectMessage, m_dummyTransport);
+
+    {
+        QSignalSpy spy(&obj, &TestObject::replay);
+        QMetaObject::invokeMethod(&obj, "fire");
+        QVERIFY(spy.wait());
+        channel.deregisterObject(&obj);
+        QMetaObject::invokeMethod(&obj, "fire");
+        QVERIFY(spy.wait());
+    }
 
     thread.quit();
     thread.wait();
diff --git a/tests/auto/webchannel/tst_webchannel.h b/tests/auto/webchannel/tst_webchannel.h
index 70a368c..94dccf5 100644
--- a/tests/auto/webchannel/tst_webchannel.h
+++ b/tests/auto/webchannel/tst_webchannel.h
@@ -123,6 +123,7 @@ signals:
     void objectPropertyChanged();
     void returnedObjectChanged();
     void propChanged(const QString&);
+    void replay();
 
 public slots:
     void slot1() {}
@@ -141,6 +142,7 @@ public slots:
     }
 
     void setProp(const QString&prop) {emit propChanged(mProp=prop);}
+    void fire() {emit replay();}
 
 protected slots:
     void slot3() {}