diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2016-09-21 15:38:47 +0200 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2016-10-01 06:22:59 +0000 |
| commit | 2ec47c9921a1e381943159f540b45c105d2ff1db (patch) | |
| tree | 0566c9f3b94d6f869514dd363546c88518eb595e /tests/auto | |
| parent | 18f386eaf30708580875a7841f138bcc197cc700 (diff) | |
Remove viewSource and canViewSource APIs and use WebAction instead
Task-number: QTBUG-56092
Change-Id: I026a0d153269a71e4e44f0fd30ef5ca054edd0e7
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/quick/qmltests/data/tst_viewSource.qml | 11 | ||||
| -rw-r--r-- | tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp | 8 |
2 files changed, 11 insertions, 8 deletions
diff --git a/tests/auto/quick/qmltests/data/tst_viewSource.qml b/tests/auto/quick/qmltests/data/tst_viewSource.qml index 746bfcfb3..79b097b80 100644 --- a/tests/auto/quick/qmltests/data/tst_viewSource.qml +++ b/tests/auto/quick/qmltests/data/tst_viewSource.qml @@ -75,10 +75,11 @@ TestWebEngineView { webEngineView.url = Qt.resolvedUrl("test1.html"); verify(webEngineView.waitForLoadSucceeded()); compare(webEngineView.title, "Test page 1"); - verify(webEngineView.canViewSource, true); + // FIXME(pvarga): Reintroduce this check in the fix for QTBUG-56117 + //verify(webEngineView.canViewSource, true); titleChangedSpy.clear(); - webEngineView.viewSource(); + webEngineView.triggerWebAction(WebEngineView.ViewSource); tryCompare(newViewRequestedSpy, "count", 1); verify(webEngineView.waitForLoadSucceeded()); // The first titleChanged signal is emitted by adoptWebContents() @@ -86,7 +87,8 @@ TestWebEngineView { compare(viewRequest.destination, WebEngineView.NewViewInTab); verify(viewRequest.userInitiated); - verify(!webEngineView.canViewSource); + // FIXME(pvarga): Reintroduce this check in the fix for QTBUG-56117 + //verify(!webEngineView.canViewSource); compare(webEngineView.title, "test1.html"); compare(webEngineView.url, "view-source:" + Qt.resolvedUrl("test1.html")); @@ -120,7 +122,8 @@ TestWebEngineView { compare(webEngineView.url, row.url); compare(webEngineView.title, row.title); - verify(!webEngineView.canViewSource); + // FIXME(pvarga): Reintroduce this check in the fix for QTBUG-56117 + //verify(!webEngineView.canViewSource); } } } diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp index 4c3a47bed..f7c0914bc 100644 --- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp +++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp @@ -4982,15 +4982,15 @@ void tst_QWebEnginePage::viewSource() page.load(url); QTRY_COMPARE(loadFinishedSpy.count(), 1); QCOMPARE(page.title(), QStringLiteral("Test page 1")); - QVERIFY(page.canViewSource()); + QVERIFY(page.action(QWebEnginePage::ViewSource)->isEnabled()); - page.viewSource(); + page.triggerAction(QWebEnginePage::ViewSource); QTRY_COMPARE(windowCreatedSpy.count(), 1); QCOMPARE(page.createdWindows.size(), 1); QTRY_COMPARE(page.createdWindows[0]->url().toString(), QStringLiteral("view-source:%1").arg(url.toString())); QTRY_COMPARE(page.createdWindows[0]->title(), QStringLiteral("view-source:%1").arg(url.toString())); - QVERIFY(!page.createdWindows[0]->canViewSource()); + QVERIFY(!page.createdWindows[0]->action(QWebEnginePage::ViewSource)->isEnabled()); } void tst_QWebEnginePage::viewSourceURL_data() @@ -5035,7 +5035,7 @@ void tst_QWebEnginePage::viewSourceURL() QCOMPARE(arguments.at(0).toBool(), loadSucceed); QCOMPARE(page->url(), url); QCOMPARE(page->title(), title); - QVERIFY(!page->canViewSource()); + QVERIFY(!page->action(QWebEnginePage::ViewSource)->isEnabled()); delete page; } |