2 files changed, 38 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..b4576af36 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,43 @@ Item {
             resultSpy.wait()
 
             compare(JSON.stringify(webView.lastResult),
-                '{"child":{"level":2},"level":"1"}')
+                '{"level":"1","child":{"level":2}}')
+        }
+
+        function test_undefinedValue() {
+            resultSpy.clear()
+            webView.url = "about:blank"
+            verify(webView.waitForLoadSucceeded())
+
+            webView.experimental.evaluateJavaScript(
+                "(function() { })()",
+
+                function(result) {
+                    webView.lastResult = result
+                })
+
+            resultSpy.wait()
+            verify(typeof webView.lastResult === "undefined")
+            compare(webView.lastResult, undefined)
+        }
+
+        function test_nullValue() {
+            resultSpy.clear()
+
+            webView.url = "about:blank"
+            verify(webView.waitForLoadSucceeded())
+
+            webView.experimental.evaluateJavaScript(
+                "(function() { return { value: null } })()",
+
+                function(result) {
+                    webView.lastResult = result
+                })
+
+            resultSpy.wait()
+            verify(typeof webView.lastResult === "object")
+            verify(typeof webView.lastResult.value === "object")
+            compare(webView.lastResult.value, null)
         }
 
         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
     }