Support multi-line prompt messages

lib/capybara/webkit/browser.rb

@@ -59,7 +59,7 @@ module Capybara::Webkit
     end
 
     def prompt_messages
-      command("JavascriptPromptMessages").split("\n")
+      JSON.parse(command("JavascriptPromptMessages"))
     end
 
     def response_headers

spec/driver_spec.rb

@@ -700,6 +700,12 @@ describe Capybara::Webkit::Driver do
         driver.find("//input").first.click
         driver.console_messages.first[:message].should == "goodbye"
       end
+
+      it "supports multi-line prompt messages" do
+        driver.execute_script("prompt('Hello\\nnewline')")
+        driver.prompt_messages.first.should == "Hello\nnewline"
+      end
+
     end
   end
 

src/JavascriptPromptMessages.cpp

@@ -1,10 +1,13 @@
 #include "JavascriptPromptMessages.h"
 #include "WebPage.h"
 #include "WebPageManager.h"
+#include "JsonSerializer.h"
 
 JavascriptPromptMessages::JavascriptPromptMessages(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {}
 
 void JavascriptPromptMessages::start()
 {
-  emitFinished(true, page()->promptMessages());
+  JsonSerializer serializer;
+  QByteArray json = serializer.serialize(page()->promptMessages());
+  emitFinished(true, json);
 }

src/WebPage.cpp

@@ -95,8 +95,8 @@ QVariantList WebPage::confirmMessages() {
   return m_confirmMessages;
 }
 
-QString WebPage::promptMessages() {
+QVariantList WebPage::promptMessages() {
-  return m_promptMessages.join("\n");
+  return m_promptMessages;
 }
 
 void WebPage::setUserAgent(QString userAgent) {

src/WebPage.h

@@ -26,7 +26,7 @@ class WebPage : public QWebPage {
     QVariantList consoleMessages();
     QVariantList alertMessages();
     QVariantList confirmMessages();
-    QString promptMessages();
+    QVariantList promptMessages();
     void resetWindowSize();
     QWebPage *createWindow(WebWindowType type);
     QString uuid();
@@ -75,7 +75,7 @@ class WebPage : public QWebPage {
     QVariantList m_alertMessages;
     QVariantList m_confirmMessages;
     QString m_prompt_text;
-    QStringList m_promptMessages;
+    QVariantList m_promptMessages;
     QString m_uuid;
     WebPageManager *m_manager;
     QString m_errorPageMessage;