more breakage
This commit is contained in:
parent
dda84fdcb9
commit
54e5d5c9d5
@ -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;
|
||||
}
|
||||
|
@ -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<QString> runnerFiles;
|
||||
QStack<QString> failedSpecs;
|
||||
|
||||
ReportFileOutput reportFileOutput;
|
||||
|
||||
QString reportFileName;
|
||||
|
||||
void loadSpec();
|
||||
|
0
jasmine/prolog.coffee
Normal file
0
jasmine/prolog.coffee
Normal file
3
jasmine/prolog.js
Normal file
3
jasmine/prolog.js
Normal file
@ -0,0 +1,3 @@
|
||||
(function() {
|
||||
|
||||
}).call(this);
|
Loading…
Reference in New Issue
Block a user