WebKit: Support multiple console.log arguments.

http://code.google.com/p/phantomjs/issues/detail?id=36
ariya · Mar 9, 2012 · ac699a4 · ac699a4 · MDCore · Mar 9, 2012
1 parent ac90639
commit ac699a4
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/src/qt/src/3rdparty/webkit/Source/WebCore/page/Console.cpp b/src/qt/src/3rdparty/webkit/Source/WebCore/page/Console.cpp
@@ -183,8 +183,12 @@ void Console::addMessage(MessageType type, MessageLevel level, PassRefPtr<Script
     }
 
     String message;
-    if (arguments->getFirstArgumentAsString(message))
-        page->chrome()->client()->addMessageToConsole(JSMessageSource, type, level, message, lastCaller.lineNumber(), lastCaller.sourceURL());
+    for (unsigned i = 0; i < arguments->argumentCount(); ++i) {
+        message.append(arguments->argumentAt(i).toString(arguments->globalState()));
+        if (i < arguments->argumentCount() - 1)
+            message.append(' ');
+    }
+    page->chrome()->client()->addMessageToConsole(JSMessageSource, type, level, message, lastCaller.lineNumber(), lastCaller.sourceURL());
 
     InspectorInstrumentation::addMessageToConsole(page, JSMessageSource, type, level, message, arguments, callStack);
 }

diff --git a/test/webpage-spec.js b/test/webpage-spec.js
@@ -207,6 +207,22 @@ describe("WebPage object", function() {
             expect(fileName).toEqual('README.md');
         });
     });
+
+    it("should support console.log with multiple arguments", function() {
+        var message;
+        runs(function() {
+            page.onConsoleMessage = function (msg) {
+                message = msg;
+            }
+        });
+
+        waits(50);
+
+        runs(function() {
+            page.evaluate(function () {console.log('answer', 42)});
+            expect(message).toEqual("answer 42");
+        });
+    });
 });
 
 describe("WebPage construction with options", function () {