From ba80558d0bc5586a02f125d62db8fc49e3f763a0 Mon Sep 17 00:00:00 2001 From: Szabolcs David Date: Fri, 11 Sep 2015 07:34:23 -0700 Subject: Unskip loadFinishedAfterNotFoundError test case Change-Id: Ie9f1aea1c7aad3e5a188667d1a38e5bc516564f8 Reviewed-by: Joerg Bornemann --- tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'tests') diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp index e6a6f9a7d..6e3976766 100644 --- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp +++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp @@ -5004,20 +5004,16 @@ void tst_QWebEnginePage::setUrlThenLoads() void tst_QWebEnginePage::loadFinishedAfterNotFoundError() { -#if !defined(QWEBENGINEPAGE_SETNETWORKACCESSMANAGER) - QSKIP("QWEBENGINEPAGE_SETNETWORKACCESSMANAGER"); -#else QWebEnginePage page; - QSignalSpy spy(&page, SIGNAL(loadFinished(bool))); - FakeNetworkManager* networkManager = new FakeNetworkManager(&page); - page.setNetworkAccessManager(networkManager); - page.setUrl(FakeReply::urlFor404ErrorWithoutContents); + page.settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, false); + page.setUrl(QUrl("http://non.existent/url")); QTRY_COMPARE(spy.count(), 1); - const bool wasLoadOk = spy.at(0).at(0).toBool(); - QVERIFY(!wasLoadOk); -#endif + + page.settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, true); + page.setUrl(QUrl("http://another.non.existent/url")); + QTRY_COMPARE(spy.count(), 2); } class URLSetter : public QObject { -- cgit v1.2.3