From 54e5d5c9d50a238133a7a646d3b9daeabef03f88 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Tue, 25 Oct 2011 11:25:02 -0400 Subject: [PATCH] more breakage --- ext/jasmine-webkit-specrunner/Runner.cpp | 15 +-------------- ext/jasmine-webkit-specrunner/Runner.h | 10 +++------- jasmine/prolog.coffee | 0 jasmine/prolog.js | 3 +++ 4 files changed, 7 insertions(+), 21 deletions(-) create mode 100644 jasmine/prolog.coffee create mode 100644 jasmine/prolog.js diff --git a/ext/jasmine-webkit-specrunner/Runner.cpp b/ext/jasmine-webkit-specrunner/Runner.cpp index 19a8a74..985f54d 100644 --- a/ext/jasmine-webkit-specrunner/Runner.cpp +++ b/ext/jasmine-webkit-specrunner/Runner.cpp @@ -74,7 +74,6 @@ bool Runner::hasElement(const char *select) { } void Runner::setColors(bool colors) { - consoleOutput.showColors = colors; } void Runner::reportFile(const QString &file) { @@ -108,27 +107,15 @@ void Runner::print(const QString &fh, const QString &content) { void Runner::errorLog(const QString &msg, int lineNumber, const QString &sourceID) { - consoleOutput.errorLog(msg, lineNumber, sourceID); - reportFileOutput.errorLog(msg, lineNumber, sourceID); - hasErrors = true; m_runs = 0; m_ticker.start(); } -void Runner::internalLog(const QString ¬e, const QString &msg) { - consoleOutput.internalLog(note, msg); - reportFileOutput.internalLog(note, msg); -} - -void Runner::usedConsole() -{ - usedConsole = true; -} +void Runner::internalLog(const QString ¬e, const QString &msg) {} void Runner::leavePageAttempt(const QString &msg) { - consoleOutput.internalLog("error", msg); m_page.oneFalseConfirm(); hasErrors = true; } diff --git a/ext/jasmine-webkit-specrunner/Runner.h b/ext/jasmine-webkit-specrunner/Runner.h index fdc9cc2..a93ae2f 100644 --- a/ext/jasmine-webkit-specrunner/Runner.h +++ b/ext/jasmine-webkit-specrunner/Runner.h @@ -25,9 +25,7 @@ class Runner: public QObject { void reportFile(const QString &file); void addFile(const QString &spec); void go(); - public slots: - void log(const QString &msg); - bool hasError(); + public slots: void leavePageAttempt(const QString &msg); void timerPause(); void timerDone(); @@ -35,8 +33,8 @@ class Runner: public QObject { void print(const QString &fh, const QString &content); void finishSuite(); - private slots: - void watch(bool ok); + private slots: + void watch(bool ok); void errorLog(const QString &msg, int lineNumber, const QString &sourceID); void internalLog(const QString ¬e, const QString &msg); void addJHW(); @@ -54,8 +52,6 @@ class Runner: public QObject { QQueue runnerFiles; QStack failedSpecs; - ReportFileOutput reportFileOutput; - QString reportFileName; void loadSpec(); diff --git a/jasmine/prolog.coffee b/jasmine/prolog.coffee new file mode 100644 index 0000000..e69de29 diff --git a/jasmine/prolog.js b/jasmine/prolog.js new file mode 100644 index 0000000..f5e757a --- /dev/null +++ b/jasmine/prolog.js @@ -0,0 +1,3 @@ +(function() { + +}).call(this);