github-migration/jasmine-headless-webkit
1
0
Fork 0
Code Issues 39 Pull Requests 16 Packages Projects Releases Wiki Activity

more breakage

Browse Source
This commit is contained in:
John Bintz 2011-10-25 11:25:02 -04:00
parent dda84fdcb9
commit 54e5d5c9d5
4 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ext/jasmine-webkit-specrunner/Runner.cpp
View File

@ -74,7 +74,6 @@ bool Runner::hasElement(const char *select) {
} }
void Runner::setColors(bool colors) { void Runner::setColors(bool colors) {
consoleOutput.showColors = colors;
} }
void Runner::reportFile(const QString &file) { 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) void Runner::errorLog(const QString &msg, int lineNumber, const QString &sourceID)
{ {
consoleOutput.errorLog(msg, lineNumber, sourceID);
reportFileOutput.errorLog(msg, lineNumber, sourceID);
hasErrors = true; hasErrors = true;
m_runs = 0; m_runs = 0;
m_ticker.start(); m_ticker.start();
} }
void Runner::internalLog(const QString &note, const QString &msg) { void Runner::internalLog(const QString &note, const QString &msg) {}
consoleOutput.internalLog(note, msg);
reportFileOutput.internalLog(note, msg);
}
void Runner::usedConsole()
{
usedConsole = true;
}
void Runner::leavePageAttempt(const QString &msg) void Runner::leavePageAttempt(const QString &msg)
{ {
consoleOutput.internalLog("error", msg);
m_page.oneFalseConfirm(); m_page.oneFalseConfirm();
hasErrors = true; hasErrors = true;
} }

10
ext/jasmine-webkit-specrunner/Runner.h
View File

@ -25,9 +25,7 @@ class Runner: public QObject {
void reportFile(const QString &file); void reportFile(const QString &file);
void addFile(const QString &spec); void addFile(const QString &spec);
void go(); void go();
public slots: public slots:
void log(const QString &msg);
bool hasError();
void leavePageAttempt(const QString &msg); void leavePageAttempt(const QString &msg);
void timerPause(); void timerPause();
void timerDone(); void timerDone();
@ -35,8 +33,8 @@ class Runner: public QObject {
void print(const QString &fh, const QString &content); void print(const QString &fh, const QString &content);
void finishSuite(); void finishSuite();
private slots: private slots:
void watch(bool ok); void watch(bool ok);
void errorLog(const QString &msg, int lineNumber, const QString &sourceID); void errorLog(const QString &msg, int lineNumber, const QString &sourceID);
void internalLog(const QString &note, const QString &msg); void internalLog(const QString &note, const QString &msg);
void addJHW(); void addJHW();
@ -54,8 +52,6 @@ class Runner: public QObject {
QQueue<QString> runnerFiles; QQueue<QString> runnerFiles;
QStack<QString> failedSpecs; QStack<QString> failedSpecs;
ReportFileOutput reportFileOutput;
QString reportFileName; QString reportFileName;
void loadSpec(); void loadSpec();

0
jasmine/prolog.coffee Normal file
View File

3
jasmine/prolog.js Normal file
View File

@ -0,0 +1,3 @@
(function() {
}).call(this);