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

exit out if there are JS errors

Browse Source
This commit is contained in:
John Bintz 2011-04-12 07:28:06 -04:00
parent 5229156bbd
commit 36b882841e
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ext/jasmine-webkit-specrunner/specrunner.cpp
View File

@ -68,11 +68,11 @@ private:
HeadlessSpecRunner::HeadlessSpecRunner() HeadlessSpecRunner::HeadlessSpecRunner()
: QObject() : QObject()
, m_runs(0) , m_runs(0)
, hasErrors(false)
{ {
m_page.settings()->enablePersistentStorage(); m_page.settings()->enablePersistentStorage();
connect(&m_page, SIGNAL(loadFinished(bool)), this, SLOT(watch(bool))); connect(&m_page, SIGNAL(loadFinished(bool)), this, SLOT(watch(bool)));
connect(&m_page, SIGNAL(consoleLog(QString, int, QString)), this, SLOT(errorLog(QString, int, QString))); connect(&m_page, SIGNAL(consoleLog(QString, int, QString)), this, SLOT(errorLog(QString, int, QString)));
hasErrors = false;
} }
void HeadlessSpecRunner::load(const QString &spec) void HeadlessSpecRunner::load(const QString &spec)
@ -104,7 +104,9 @@ void HeadlessSpecRunner::errorLog(const QString &msg, int lineNumber, const QStr
std::cout << "\033[0;31m" << "[error] " << "\033[m;"; std::cout << "\033[0;31m" << "[error] " << "\033[m;";
std::cout << qPrintable(sourceID) << ":" << lineNumber << " : " << qPrintable(msg); std::cout << qPrintable(sourceID) << ":" << lineNumber << " : " << qPrintable(msg);
std::cout << std::endl; std::cout << std::endl;
hasErrors = true; hasErrors = true;
m_ticker.start(200, this);
} }
void HeadlessSpecRunner::log(const QString &msg) void HeadlessSpecRunner::log(const QString &msg)
@ -142,9 +144,14 @@ void HeadlessSpecRunner::specLog(int indent, const QString &msg, const QString &
void HeadlessSpecRunner::timerEvent(QTimerEvent *event) void HeadlessSpecRunner::timerEvent(QTimerEvent *event)
{ {
++m_runs;
if (event->timerId() != m_ticker.timerId()) if (event->timerId() != m_ticker.timerId())
return; return;
if (hasErrors && m_runs > 5)
QApplication::instance()->exit(1);
if (!hasElement(".jasmine_reporter") && !hasElement(".runner.running")) if (!hasElement(".jasmine_reporter") && !hasElement(".runner.running"))
return; return;
@ -164,8 +171,7 @@ void HeadlessSpecRunner::timerEvent(QTimerEvent *event)
return; return;
} }
++m_runs; if (m_runs > 30) {
if (m_runs > 20) {
std::cout << "WARNING: too many runs and the test is still not finished!" << std::endl; std::cout << "WARNING: too many runs and the test is still not finished!" << std::endl;
QApplication::instance()->exit(1); QApplication::instance()->exit(1);
} }