From 9db27320eda70ec4e4948ae0853dd3f2dd08912b Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 5 Feb 2016 13:27:14 +0100 Subject: Fix double LoadFinished on URL errors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RenderFrameDeleted was called before DidFinishLoad, which meant m_loadingErrorFrameList was empty and wouldn't detect the page loaded was an error page. Instead this patch relies on the chromium error-page url which we already asserted. Additonally we delay emitting the loadFinished signal until the error page is also done loading, since the error-page can be considered part of the load, and we otherwise have a race condition on toPlainText. Finally we were not getting error-pages when blocking requests because we reported them as aborted them instead of blocked. Change-Id: I945eb838b7f080d4e146f18354e8986e1b88b5cd Task-number: QTBUG-50752 Reviewed-by: Michael Brüning --- .../widgets/qwebenginepage/tst_qwebenginepage.cpp | 33 ++++++++++++++++++++++ .../qwebengineprofile/tst_qwebengineprofile.cpp | 3 +- 2 files changed, 35 insertions(+), 1 deletion(-) (limited to 'tests/auto/widgets') diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp index 690cf70e4..207eb019a 100644 --- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp +++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp @@ -241,6 +241,8 @@ private Q_SLOTS: void loadInSignalHandlers(); void restoreHistory(); + void toPlainTextLoadFinishedRace_data(); + void toPlainTextLoadFinishedRace(); private: QWebEngineView* m_view; @@ -5115,5 +5117,36 @@ void tst_QWebEnginePage::restoreHistory() delete channel; } +void tst_QWebEnginePage::toPlainTextLoadFinishedRace_data() +{ + QTest::addColumn("enableErrorPage"); + QTest::newRow("disableErrorPage") << false; + QTest::newRow("enableErrorPage") << true; +} + +void tst_QWebEnginePage::toPlainTextLoadFinishedRace() +{ + QFETCH(bool, enableErrorPage); + + QWebEnginePage *page = new QWebEnginePage; + page->settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, enableErrorPage); + QSignalSpy spy(page, SIGNAL(loadFinished(bool))); + + page->load(QUrl("data:text/plain,foobarbaz")); + QTRY_VERIFY(spy.count() == 1); + QCOMPARE(toPlainTextSync(page), QString("foobarbaz")); + + page->load(QUrl("fail:unknown/scheme")); + QTRY_VERIFY(spy.count() == 2); + QString s = toPlainTextSync(page); + QVERIFY(s.contains("foobarbaz") == !enableErrorPage); + + page->load(QUrl("data:text/plain,lalala")); + QTRY_VERIFY(spy.count() == 3); + QCOMPARE(toPlainTextSync(page), QString("lalala")); + delete page; + QVERIFY(spy.count() == 3); +} + QTEST_MAIN(tst_QWebEnginePage) #include "tst_qwebenginepage.moc" diff --git a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp index 9195a5190..7cd423356 100644 --- a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp +++ b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp @@ -182,9 +182,10 @@ void tst_QWebEngineProfile::urlSchemeHandlerFailRequest() QWebEngineView view; QSignalSpy loadFinishedSpy(&view, SIGNAL(loadFinished(bool))); view.setPage(new QWebEnginePage(&profile, &view)); + view.settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, false); view.load(QUrl(QStringLiteral("foo://bar"))); QVERIFY(loadFinishedSpy.wait()); - QVERIFY(toPlainTextSync(view.page()).isEmpty()); + QCOMPARE(toPlainTextSync(view.page()), QString()); } QTEST_MAIN(tst_QWebEngineProfile) -- cgit v1.2.3