From 5229156bbd2dc8bffa6a3e33f8d2639c2db75060 Mon Sep 17 00:00:00 2001
From: John Bintz <john@coswellproductions.com>
Date: Tue, 12 Apr 2011 07:10:03 -0400
Subject: [PATCH] show javascript errors

---
 .gitignore                                   |  4 +++
 ext/jasmine-webkit-specrunner/specrunner.cpp | 28 +++++++++++++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 4040c6c..d4de0d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,7 @@
 .bundle
 Gemfile.lock
 pkg/*
+Makefile
+specrunner.moc
+specrunner.o
+jasmine-webkit-specrunner
diff --git a/ext/jasmine-webkit-specrunner/specrunner.cpp b/ext/jasmine-webkit-specrunner/specrunner.cpp
index 5a920fa..ad86408 100644
--- a/ext/jasmine-webkit-specrunner/specrunner.cpp
+++ b/ext/jasmine-webkit-specrunner/specrunner.cpp
@@ -29,6 +29,20 @@
 #error Use Qt 4.7 or later version
 #endif
 
+class HeadlessSpecRunnerPage: public QWebPage
+{
+  Q_OBJECT
+signals:
+  void consoleLog(const QString &msg, int lineNumber, const QString &sourceID);
+protected:
+  void javaScriptConsoleMessage(const QString & message, int lineNumber, const QString & sourceID);
+};
+
+void HeadlessSpecRunnerPage::javaScriptConsoleMessage(const QString &message, int lineNumber, const QString &sourceID)
+{
+  emit consoleLog(message, lineNumber, sourceID);
+}
+
 class HeadlessSpecRunner: public QObject
 {
     Q_OBJECT
@@ -40,13 +54,15 @@ public slots:
     void specLog(int indent, const QString &msg, const QString &clazz);
 private slots:
     void watch(bool ok);
+    void errorLog(const QString &msg, int lineNumber, const QString &sourceID);
 protected:
     bool hasElement(const char *select);
     void timerEvent(QTimerEvent *event);
 private:
-    QWebPage m_page;
+    HeadlessSpecRunnerPage m_page;
     QBasicTimer m_ticker;
     int m_runs;
+    bool hasErrors;
 };
 
 HeadlessSpecRunner::HeadlessSpecRunner()
@@ -55,6 +71,8 @@ HeadlessSpecRunner::HeadlessSpecRunner()
 {
     m_page.settings()->enablePersistentStorage();
     connect(&m_page, SIGNAL(loadFinished(bool)), this, SLOT(watch(bool)));
+    connect(&m_page, SIGNAL(consoleLog(QString, int, QString)), this, SLOT(errorLog(QString, int, QString)));
+    hasErrors = false;
 }
 
 void HeadlessSpecRunner::load(const QString &spec)
@@ -81,6 +99,14 @@ bool HeadlessSpecRunner::hasElement(const char *select)
     return !m_page.mainFrame()->findFirstElement(select).isNull();
 }
 
+void HeadlessSpecRunner::errorLog(const QString &msg, int lineNumber, const QString &sourceID)
+{
+  std::cout << "\033[0;31m" << "[error] " << "\033[m;";
+  std::cout << qPrintable(sourceID) << ":" << lineNumber << " : " << qPrintable(msg);
+  std::cout << std::endl;
+  hasErrors = true;
+}
+
 void HeadlessSpecRunner::log(const QString &msg)
 {
   std::cout << "\033[0;32m" << "[console] " << "\033[m";