diff --git a/test/lib/jasmine-console.js b/test/lib/jasmine-console.js index d806d5b1..d3e82a24 100644 --- a/test/lib/jasmine-console.js +++ b/test/lib/jasmine-console.js @@ -1,4 +1,4 @@ -jasmine.ConsoleReporter = function(print, doneCallback, showColors) { +jasmine.ConsoleReporter = function(print, doneCallback, showColors, verbose) { //inspired by mhevery's jasmine-node reporter //https://github.com/mhevery/jasmine-node @@ -129,12 +129,26 @@ jasmine.ConsoleReporter = function(print, doneCallback, showColors) { this.reportSpecResults = function(spec) { var results = spec.results(); - if (results.skipped) { - yellowStar(); - } else if (results.passed()) { - greenDot(); + if (verbose) { + var msg; + if (results.skipped) { + msg = yellowStr("SKIP"); + } else if (results.passed()) { + msg = greenStr("PASS"); + } else { + msg = redStr("FAIL"); + } + msg += " " + spec.getFullName(); + print(msg); + newline(); } else { - redF(); + if (results.skipped) { + yellowStar(); + } else if (results.passed()) { + greenDot(); + } else { + redF(); + } } }; diff --git a/test/run-tests.js b/test/run-tests.js index d9127d1d..f79acd6c 100644 --- a/test/run-tests.js +++ b/test/run-tests.js @@ -79,13 +79,22 @@ require("./cjk-text-codecs.js"); // Environment configuration var jasmineEnv = jasmine.getEnv(); -// If there are any command line arguments, filter tests based on them. -var sys = require('system'); +// Command line arguments +var sys = require("system"); +var verbose = false; if (sys.args.length > 1) { - var specFilterRe = new RegExp(sys.args.slice(1).join(" ")); - jasmineEnv.specFilter = function (spec) { - return specFilterRe.test(spec.getFullName()); - }; + var rest = 1; + if (sys.args[1] == "-v" || sys.args[1] == "--verbose") { + verbose = true; + rest = 2; + } + + if (sys.args.length > rest) { + var specFilterRe = new RegExp(sys.args.slice(rest).join(" ")); + jasmineEnv.specFilter = function (spec) { + return specFilterRe.test(spec.getFullName()); + }; + } } // Add a ConsoleReporter to 1) print with colors on the console @@ -98,7 +107,10 @@ jasmineEnv.addReporter(new jasmine.ConsoleReporter( phantom.exit(reporter.results().failedCount > 0 ? 1 : 0); }, // Colorized - true)); + true, + // Verbosity + verbose +)); // Launch tests jasmineEnv.updateInterval = 1000;