summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Tokarev <annulen@yandex.ru>2017-04-01 11:57:54 +0300
committerKonstantin Tokarev <annulen@yandex.ru>2017-04-03 22:18:30 +0000
commit64f830beec03cd4ccf5ad586f2db21d38dcd85b2 (patch)
tree641146f84b30533fd55e83edd48eaddc34b8dc08
parentc176f1fbe8ed0d87c507811f4c0e4d67a71bc890 (diff)
Fix some QML tests
Change-Id: If478dd4aa9fc4492c3999f03e5f66811c9e6b41f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_evaluateJavaScript.qml2
-rw-r--r--Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_webchannel.qml2
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_evaluateJavaScript.qml b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_evaluateJavaScript.qml
index 720b4cd04..ea903f328 100644
--- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_evaluateJavaScript.qml
+++ b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_evaluateJavaScript.qml
@@ -78,7 +78,7 @@ Item {
resultSpy.wait()
compare(JSON.stringify(webView.lastResult),
- '{"child":{"level":2},"level":"1"}')
+ '{"level":"1","child":{"level":2}}')
}
function test_booleanValue() {
diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_webchannel.qml b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_webchannel.qml
index 26f30eedd..5b2e08cfd 100644
--- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_webchannel.qml
+++ b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_webchannel.qml
@@ -64,7 +64,7 @@ Item {
TestWebView {
id: webView
- experimental.windowObjects: [testObject]
+ experimental.webChannel.registeredObjects: [testObject]
experimental.preferences.developerExtrasEnabled: true
}