diff options
author | Kirill Burtsev <kirill.burtsev@qt.io> | 2021-02-24 12:38:24 +0100 |
---|---|---|
committer | Kirill Burtsev <kirill.burtsev@qt.io> | 2021-03-03 21:39:12 +0100 |
commit | e7c869c225075d898cb5d20b194af4b939d2dbc1 (patch) | |
tree | 21cc92c0197c50f41b80c92d7362404ba8be2ed4 /tests | |
parent | eb92ad14753b91fc63ab17ab79c6637512921423 (diff) |
qmltests: don't use implicit 'loadRequest' arg in 'onLoadingChanged'
Prerequisite for WebEngineLoadRequest type rename
Change-Id: Ia8f4f15317881ba522c778c443cf17e55f5c9d65
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'tests')
8 files changed, 29 insertions, 33 deletions
diff --git a/tests/auto/quick/certificateerror/WebView.qml b/tests/auto/quick/certificateerror/WebView.qml index 97abdfb98..558277dec 100644 --- a/tests/auto/quick/certificateerror/WebView.qml +++ b/tests/auto/quick/certificateerror/WebView.qml @@ -47,12 +47,8 @@ Window { WebEngineView { id: view anchors.fill: parent - onLoadingChanged: function(request) { - if (request.status === WebEngineView.LoadSucceededStatus) { - handler.loadSuccess = true - } else if (request.status === WebEngineView.LoadFailedStatus) { - handler.loadSuccess = false - } + onLoadingChanged: function(load) { + handler.loadSuccess = load.status === WebEngineView.LoadSucceededStatus } onCertificateError: function(error) { handler.certificateError = error diff --git a/tests/auto/quick/qmltests/data/TestWebEngineView.qml b/tests/auto/quick/qmltests/data/TestWebEngineView.qml index f2bc09e4b..4840f474d 100644 --- a/tests/auto/quick/qmltests/data/TestWebEngineView.qml +++ b/tests/auto/quick/qmltests/data/TestWebEngineView.qml @@ -106,8 +106,8 @@ WebEngineView { TestResult { id: testResult } TestCase { id: testCase } - onLoadingChanged: { - loadStatus = loadRequest.status + onLoadingChanged: function(load) { + loadStatus = load.status } onWindowCloseRequested: { diff --git a/tests/auto/quick/qmltests/data/tst_favicon.qml b/tests/auto/quick/qmltests/data/tst_favicon.qml index 3f522d91a..92c50876c 100644 --- a/tests/auto/quick/qmltests/data/tst_favicon.qml +++ b/tests/auto/quick/qmltests/data/tst_favicon.qml @@ -47,8 +47,8 @@ TestWebEngineView { return success } - errorPage.onLoadingChanged: { - errorPageLoadStatus = loadRequest.status + errorPage.onLoadingChanged: function(load) { + errorPageLoadStatus = load.status } } diff --git a/tests/auto/quick/qmltests/data/tst_getUserMedia.qml b/tests/auto/quick/qmltests/data/tst_getUserMedia.qml index d1c894699..4cfbbf090 100644 --- a/tests/auto/quick/qmltests/data/tst_getUserMedia.qml +++ b/tests/auto/quick/qmltests/data/tst_getUserMedia.qml @@ -126,8 +126,8 @@ TestWebEngineView { signalName: "loadFinished" } - onLoadingChanged: { - if (loadRequest.status == WebEngineLoadRequest.LoadSucceededStatus) { + onLoadingChanged: function(load) { + if (load.status == WebEngineView.LoadSucceededStatus) { loadFinished() } } diff --git a/tests/auto/quick/qmltests/data/tst_loadFail.qml b/tests/auto/quick/qmltests/data/tst_loadFail.qml index db412f252..8a46afbad 100644 --- a/tests/auto/quick/qmltests/data/tst_loadFail.qml +++ b/tests/auto/quick/qmltests/data/tst_loadFail.qml @@ -49,28 +49,28 @@ TestWebEngineView { return success } - errorPage.onLoadingChanged: { - errorPageLoadStatus = loadRequest.status + errorPage.onLoadingChanged: function(load) { + errorPageLoadStatus = load.status loadRequestArray.push({ - "status": loadRequest.status, - "url": loadRequest.url.toString(), - "errorDomain": loadRequest.errorDomain, + "status": load.status, + "url": load.url.toString(), + "errorDomain": load.errorDomain, "isErrorPage": true }) } } - onLoadingChanged: { - if (loadRequest.status == WebEngineView.LoadFailedStatus) { - test.compare(loadRequest.url, unavailableUrl) - test.compare(loadRequest.errorDomain, WebEngineView.InternalErrorDomain) + onLoadingChanged: function(load) { + if (load.status == WebEngineView.LoadFailedStatus) { + test.compare(load.url, unavailableUrl) + test.compare(load.errorDomain, WebEngineView.InternalErrorDomain) } loadRequestArray.push({ - "status": loadRequest.status, - "url": loadRequest.url.toString(), - "errorDomain": loadRequest.errorDomain, + "status": load.status, + "url": load.url.toString(), + "errorDomain": load.errorDomain, "isErrorPage": false }) } diff --git a/tests/auto/quick/qmltests/data/tst_loadUrl.qml b/tests/auto/quick/qmltests/data/tst_loadUrl.qml index 47dbbc087..817a28637 100644 --- a/tests/auto/quick/qmltests/data/tst_loadUrl.qml +++ b/tests/auto/quick/qmltests/data/tst_loadUrl.qml @@ -37,10 +37,10 @@ TestWebEngineView { property var loadRequestArray: [] - onLoadingChanged: { + onLoadingChanged: function(load) { loadRequestArray.push({ - "status": loadRequest.status, - "url": loadRequest.url, + "status": load.status, + "url": load.url, "activeUrl": webEngineView.url }); } diff --git a/tests/auto/quick/qmltests/data/tst_newViewRequest.qml b/tests/auto/quick/qmltests/data/tst_newViewRequest.qml index 08d63d956..cce657f81 100644 --- a/tests/auto/quick/qmltests/data/tst_newViewRequest.qml +++ b/tests/auto/quick/qmltests/data/tst_newViewRequest.qml @@ -40,9 +40,9 @@ TestWebEngineView { property string viewType: "" property var loadRequestArray: [] - onLoadingChanged: { + onLoadingChanged: function(load) { loadRequestArray.push({ - "status": loadRequest.status, + "status": load.status, }); } diff --git a/tests/auto/quick/qmltests/data/tst_viewSoure.qml b/tests/auto/quick/qmltests/data/tst_viewSoure.qml index 997582335..870f6ee7b 100644 --- a/tests/auto/quick/qmltests/data/tst_viewSoure.qml +++ b/tests/auto/quick/qmltests/data/tst_viewSoure.qml @@ -41,16 +41,16 @@ TestWebEngineView { property var loadRequestArray: [] testSupport: WebEngineTestSupport { - errorPage.onLoadingChanged: { + errorPage.onLoadingChanged: function(load) { loadRequestArray.push({ - "status": loadRequest.status, + "status": load.status, }) } } - onLoadingChanged: { + onLoadingChanged: function(load) { loadRequestArray.push({ - "status": loadRequest.status, + "status": load.status, }); } |