Support multi-line confirmation messages

lib/capybara/webkit/browser.rb

@@ -55,7 +55,7 @@ module Capybara::Webkit
     end
 
     def confirm_messages
-      command("JavascriptConfirmMessages").split("\n")
+      JSON.parse(command("JavascriptConfirmMessages"))
     end
 
     def prompt_messages

spec/driver_spec.rb

@@ -615,6 +615,12 @@ describe Capybara::Webkit::Driver do
         driver.find("//input").first.click
         driver.console_messages.first[:message].should == "hello"
       end
+
+      it "supports multi-line confirmation messages" do
+        driver.execute_script("confirm('Hello\\nnewline')")
+        driver.confirm_messages.first.should == "Hello\nnewline"
+      end
+
     end
 
     context "on a prompt app" do

src/JavascriptConfirmMessages.cpp

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

src/WebPage.cpp

@@ -91,8 +91,8 @@ QString WebPage::alertMessages() {
   return m_alertMessages.join("\n");
 }
 
-QString WebPage::confirmMessages() {
-  return m_confirmMessages.join("\n");
+QVariantList WebPage::confirmMessages() {
+  return m_confirmMessages;
 }
 
 QString WebPage::promptMessages() {

src/WebPage.h

@@ -25,7 +25,7 @@ class WebPage : public QWebPage {
     void setSkipImageLoading(bool skip);
     QVariantList consoleMessages();
     QString alertMessages();
-    QString confirmMessages();
+    QVariantList confirmMessages();
     QString promptMessages();
     void resetWindowSize();
     QWebPage *createWindow(WebWindowType type);
@@ -73,7 +73,7 @@ class WebPage : public QWebPage {
     bool m_prompt;
     QVariantList m_consoleMessages;
     QStringList m_alertMessages;
-    QStringList m_confirmMessages;
+    QVariantList m_confirmMessages;
     QString m_prompt_text;
     QStringList m_promptMessages;
     QString m_uuid;