2 files changed, 28 insertions, 2 deletions
diff --git a/tests/auto/quick/qquickwebengineviewgraphics/qquickwebengineviewgraphics.pro b/tests/auto/quick/qquickwebengineviewgraphics/qquickwebengineviewgraphics.pro
index ff6c49628..cbd11cdca 100644
--- a/tests/auto/quick/qquickwebengineviewgraphics/qquickwebengineviewgraphics.pro
+++ b/tests/auto/quick/qquickwebengineviewgraphics/qquickwebengineviewgraphics.pro
@@ -1,2 +1,3 @@
 include(../tests.pri)
 exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc
+QT_PRIVATE += webengine-private
diff --git a/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp b/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp
index ad72ea0cc..d64ab5d16 100644
--- a/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp
+++ b/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp
@@ -45,6 +45,7 @@
 #include <QQuickItem>
 #include <QPainter>
 #include <qtwebengineglobal.h>
+#include <private/qquickwebengineview_p.h>
 
 class TestView : public QQuickView {
     Q_OBJECT
@@ -72,6 +73,7 @@ public Q_SLOTS:
 
 private Q_SLOTS:
     void simpleGraphics();
+    void renderMultipleTimes();
     void renderAfterNodeCleanup();
     void showHideShow();
     void simpleAcceleratedLayer();
@@ -97,6 +99,21 @@ static QImage get150x150GreenReferenceImage()
     return reference;
 }
 
+static inline bool waitForSignal(QObject *obj, const char *signal, int timeout = 10000)
+{
+    QEventLoop loop;
+    QObject::connect(obj, signal, &loop, SLOT(quit()));
+    QTimer timer;
+    QSignalSpy timeoutSpy(&timer, SIGNAL(timeout()));
+    if (timeout > 0) {
+        QObject::connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit()));
+        timer.setSingleShot(true);
+        timer.start(timeout);
+    }
+    loop.exec();
+    return timeoutSpy.isEmpty();
+}
+
 tst_QQuickWebEngineViewGraphics::tst_QQuickWebEngineViewGraphics()
 {
 }
@@ -127,6 +144,14 @@ void tst_QQuickWebEngineViewGraphics::simpleGraphics()
     QCOMPARE(m_view->grabWindow(), get150x150GreenReferenceImage());
 }
 
+void tst_QQuickWebEngineViewGraphics::renderMultipleTimes()
+{
+    // This test is for loadVisuallyCommitted signal.
+    // The setHtml() should not fail after multiple page load.
+    setHtml(greenSquare);
+    setHtml(greenSquare);
+}
+
 void tst_QQuickWebEngineViewGraphics::renderAfterNodeCleanup()
 {
     setHtml(greenSquare);
@@ -177,8 +202,8 @@ void tst_QQuickWebEngineViewGraphics::setHtml(const QString &html)
     m_view->setSource(QUrl(QStringLiteral("data:text/plain,%1").arg(qmlData)));
     m_view->create();
 
-    // FIXME: Replace with a proper initialLayout signal.
-    QTest::qWait(200);
+    QQuickWebEngineView *webEngineView = static_cast<QQuickWebEngineView *>(m_view->rootObject());
+    QVERIFY(waitForSignal(reinterpret_cast<QObject *>(webEngineView->experimental()), SIGNAL(loadVisuallyCommitted())));
     QCOMPARE(m_view->rootObject()->property("loading"), QVariant(false));
 }