From 202d2ac93c4b4d6aed49eaa5793c35a9071f4602 Mon Sep 17 00:00:00 2001 From: Szabolcs David Date: Mon, 4 Aug 2014 06:47:16 -0700 Subject: Fix tst_QWebEngineFrame::setUrlWithFragment test Change this test to rely on urlChanged() instead loadFinished(), because we don't get loadFinished signal if the load was handled by the same page. Change-Id: I65aa06afa4512fa845074ad97b87ecba16da687e Reviewed-by: Jocelyn Turcotte --- tests/auto/widgets/qwebengineframe/tst_qwebengineframe.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/auto/widgets/qwebengineframe/tst_qwebengineframe.cpp b/tests/auto/widgets/qwebengineframe/tst_qwebengineframe.cpp index 3846e50c9..1fc4aaea5 100644 --- a/tests/auto/widgets/qwebengineframe/tst_qwebengineframe.cpp +++ b/tests/auto/widgets/qwebengineframe/tst_qwebengineframe.cpp @@ -1256,16 +1256,17 @@ void tst_QWebEngineFrame::setUrlWithFragment() QCOMPARE(page.url(), previousUrl); } - QSignalSpy spy(&page, SIGNAL(loadFinished(bool))); + QSignalSpy spy(&page, SIGNAL(urlChanged(QUrl))); const QUrl url("qrc:/test1.html#"); QVERIFY(!url.fragment().isNull()); page.setUrl(url); - ::waitForSignal(&page, SIGNAL(loadFinished(bool))); + ::waitForSignal(&page, SIGNAL(urlChanged(QUrl))); QCOMPARE(spy.count(), 1); QVERIFY(!toPlainTextSync(&page).isEmpty()); - QCOMPARE(page.requestedUrl(), url); + // Slight change: This information now comes from Chromium and the behavior of requestedUrl changed in this case. + // QCOMPARE(page.requestedUrl(), url); QCOMPARE(page.url(), url); } -- cgit v1.2.3