summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorSzabolcs David <davidsz@inf.u-szeged.hu>2015-09-11 07:34:23 -0700
committerSzabolcs David <davidsz@inf.u-szeged.hu>2015-09-14 15:40:47 +0000
commitba80558d0bc5586a02f125d62db8fc49e3f763a0 (patch)
tree3a314ec1090b9a4e9079cb3172b273c96b841659 /tests/auto
parentcf7b421b9c268397e241b70cc7552ae370ed7e53 (diff)
Unskip loadFinishedAfterNotFoundError test case
Change-Id: Ie9f1aea1c7aad3e5a188667d1a38e5bc516564f8 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp16
1 files changed, 6 insertions, 10 deletions
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 {