diff options
| author | Pierre Rossi <pierre.rossi@digia.com> | 2014-01-21 15:42:56 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-19 15:48:07 +0100 |
| commit | 548c7eb37456c13fa16ca286016434cdcbdcf96a (patch) | |
| tree | ca7f3e538fa36206638955f908df6565d67a95d0 /tests/auto | |
| parent | 09910d11219b7b17d6044671f51a769335c4797e (diff) | |
QtQuick: add runJavaScript.
Much like the widgets version.
This should be helpful to start testing QWebChannel integration.
Includes a very basic autotest that checks both approaches (with or
without callback) through the view's title property.
Change-Id: Id9c3e3736f36d53cecf1dd52e8811c4b921dcf08
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/quick/qmltests/data/TestWebEngineView.qml | 3 | ||||
| -rw-r--r-- | tests/auto/quick/qmltests/data/tst_runJavaScript.qml | 79 | ||||
| -rw-r--r-- | tests/auto/quick/qmltests/qmltests.pro | 3 |
3 files changed, 84 insertions, 1 deletions
diff --git a/tests/auto/quick/qmltests/data/TestWebEngineView.qml b/tests/auto/quick/qmltests/data/TestWebEngineView.qml index 910ecbd7d..44a7f4f83 100644 --- a/tests/auto/quick/qmltests/data/TestWebEngineView.qml +++ b/tests/auto/quick/qmltests/data/TestWebEngineView.qml @@ -42,6 +42,7 @@ import QtQuick 2.0 import QtTest 1.0 import QtWebEngine 1.0 +import QtWebEngine.experimental 1.0 WebEngineView { property var loadStatus: null @@ -78,6 +79,8 @@ WebEngineView { return predicate() } + function runJavaScript(script, callback) { experimental.runJavaScript(script, callback); } + TestResult { id: testResult } onLoadingStateChanged: { diff --git a/tests/auto/quick/qmltests/data/tst_runJavaScript.qml b/tests/auto/quick/qmltests/data/tst_runJavaScript.qml new file mode 100644 index 000000000..42c6928e5 --- /dev/null +++ b/tests/auto/quick/qmltests/data/tst_runJavaScript.qml @@ -0,0 +1,79 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtTest 1.0 +import QtWebEngine 1.0 + +TestWebEngineView { + id: webEngineView + width: 400 + height: 300 + + SignalSpy { + id: spy + target: webEngineView + signalName: "titleChanged" + } + + TestCase { + name: "WebEngineViewRunJavaScript" + function test_runJavaScript() { + var testTitle = "Title to test runJavaScript"; + runJavaScript("document.title = \"" + testTitle +"\""); + _waitFor(function() { spy.count > 0; }); + compare(spy.count, 1); + compare(webEngineView.title, testTitle); + + var testTitle2 = "Foobar" + var testHtml = "<html><head><title>" + testTitle2 + "</title></head><body></body></html>"; + loadHtml(testHtml); + waitForLoadSucceeded(); + var callbackCalled = false; + runJavaScript("document.title", function(result) { + compare(result, testTitle2); + callbackCalled = true; + }); + wait(100); + verify(callbackCalled); + } + } +} diff --git a/tests/auto/quick/qmltests/qmltests.pro b/tests/auto/quick/qmltests/qmltests.pro index 19df60591..5883574d3 100644 --- a/tests/auto/quick/qmltests/qmltests.pro +++ b/tests/auto/quick/qmltests/qmltests.pro @@ -1,6 +1,6 @@ include(../tests.pri) -QT += webengine qmltest +QT += qmltest QT_PRIVATE += quick-private IMPORTPATH += $$PWD/data @@ -16,6 +16,7 @@ OTHER_FILES += \ $$PWD/data/tst_loadProgressSignal.qml \ $$PWD/data/tst_loadUrl.qml \ $$PWD/data/tst_properties.qml \ + $$PWD/data/tst_runJavaScript.qml \ $$PWD/data/tst_titleChanged.qml load(qt_build_paths) |