Import WebKit commit d6bf9b7a5a72ec63236f3f2d0eabc20913309793v5.212.0-alpha3

Change-Id: I15a655045d43ea5f2cfe1158016db6426ded0224
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
 

1 files changed, 25 insertions, 0 deletions

diff --git a/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp b/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
index 17bc703fc..ab15c6315 100644
--- a/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
+++ b/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
@@ -94,6 +94,7 @@ private Q_SLOTS:
     void setUrlThenLoads_data();
     void setUrlThenLoads();
     void loadFinishedAfterNotFoundError();
+    void signalsDuringErrorHandling();
     void loadInSignalHandlers_data();
     void loadInSignalHandlers();
 
@@ -1472,6 +1473,30 @@ void tst_QWebFrame::loadFinishedAfterNotFoundError()
     QVERIFY(!wasLoadOk);
 }
 
+void tst_QWebFrame::signalsDuringErrorHandling()
+{
+    QWebPage page;
+    QWebFrame* frame = page.mainFrame();
+
+    QSignalSpy loadStartedSpy(frame, &QWebFrame::loadStarted);
+    QSignalSpy loadFinishedSpy(frame, &QWebFrame::loadFinished);
+    FakeNetworkManager* networkManager = new FakeNetworkManager(&page);
+    page.setNetworkAccessManager(networkManager);
+
+    frame->setUrl(FakeReply::urlFor404ErrorWithoutContents);
+    QTRY_COMPARE(loadStartedSpy.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    bool wasLoadOk = loadFinishedSpy.at(0).at(0).toBool();
+    QVERIFY(!wasLoadOk);
+
+    frame->load(QUrl("http://example.com"));
+    waitForSignal(frame, SIGNAL(loadFinished(bool)));
+    QCOMPARE(loadStartedSpy.count(), 2);
+    QCOMPARE(loadFinishedSpy.count(), 2);
+    wasLoadOk = loadFinishedSpy.at(1).at(0).toBool();
+    QVERIFY(wasLoadOk);
+}
+
 class URLSetter : public QObject {
     Q_OBJECT