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

And what I meant was *this* commit was pulling in the fixes to TrivialConsoleReporter

This commit is contained in:
Davis W. Frank 2011-05-25 08:28:16 -07:00
parent 7ead5388c2 a445a62e7c
commit da297d0f56
3 changed files with 647 additions and 548 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
spec/node_suite.js
View File

@ -6,7 +6,9 @@ var path = require('path');
// undefined = "diz be undefined yo";
var jasmineGlobals = require("../src/base");
for(var k in jasmineGlobals) {global[k] = jasmineGlobals[k];}
for (var k in jasmineGlobals) {
global[k] = jasmineGlobals[k];
}
//load jasmine src files based on the order in runner.html
var srcFilesInProperRequireOrder = [];
@ -34,7 +36,8 @@ global.window = {
delete global.window;
function noop(){}
function noop() {
}
jasmine.executeSpecs = function(specs, done) {
for (var i = 0, len = specs.length; i < len; ++i) {
@ -43,7 +46,9 @@ jasmine.executeSpecs = function(specs, done){
}
var jasmineEnv = jasmine.getEnv();
jasmineEnv.reporter = new jasmine.TrivialConsoleReporter(sys.print, done)
var consoleReporter = new jasmine.TrivialConsoleReporter(sys.print, done);
jasmineEnv.addReporter(consoleReporter);
jasmineEnv.execute();
};
@ -70,16 +75,6 @@ jasmine.getAllSpecFiles = function(dir, matcher){
return specs;
};
jasmine.printRunnerResults = function(runner){
var results = runner.results();
var suites = runner.suites();
var msg = '';
msg += suites.length + ' spec' + ((suites.length === 1) ? '' : 's') + ', ';
msg += results.totalCount + ' expectation' + ((results.totalCount === 1) ? '' : 's') + ', ';
msg += results.failedCount + ' failure' + ((results.failedCount === 1) ? '' : 's') + '\n';
return msg;
};
function now() {
return new Date().getTime();
}
@ -114,10 +109,6 @@ for ( var key in jasmine) {
End jasmine-node runner
*/
var isVerbose = false;
var showColors = true;
process.argv.forEach(function(arg) {

385
spec/suites/TrivialConsoleReporterSpec.js
View File

@ -1,24 +1,71 @@
if (jasmine.TrivialConsoleReporter) {
describe("TrivialConsoleReporter", function() {
//keep these literal. otherwise the test loses value as a test.
function green(str) { return '\033[32m' + str + '\033[0m'; }
function red(str) { return '\033[31m' + str + '\033[0m'; }
function yellow(str) { return '\033[33m' + str + '\033[0m'; }
function green(str) {
return '\033[32m' + str + '\033[0m';
}
function prefixGreen(str) { return '\033[32m' + str; }
function prefixRed(str) { return '\033[31m' + str; }
function red(str) {
return '\033[31m' + str + '\033[0m';
}
function yellow(str) {
return '\033[33m' + str + '\033[0m';
}
function prefixGreen(str) {
return '\033[32m' + str;
}
function prefixRed(str) {
return '\033[31m' + str;
}
var newline = "\n";
var passingSpec = { results: function(){ return {passed: function(){return true;}}; } },
failingSpec = { results: function(){ return {passed: function(){return false;}}; } },
skippedSpec = { results: function(){ return {skipped: true}; } },
passingRun = { results: function(){ return {failedCount: 0, items_: [null, null, null]}; } },
failingRun = { results: function(){ return {failedCount: 7, items_: [null, null, null]}; } };
var passingSpec = {
results: function() {
return {
passed: function() {
return true;
}
};
}
},
failingSpec = {
results: function() {
return {
passed: function() {
return false;
}
};
}
},
skippedSpec = {
results: function() {
return {skipped: true};
}
},
passingRun = {
specs: function() {
return [null, null, null];
},
results: function() {
return {failedCount: 0, items_: [null, null, null]};
}
},
failingRun = {
specs: function() {
return [null, null, null];
},
results: function() {
return {
failedCount: 7, items_: [null, null, null]};
}
};
function repeatedlyInvoke(f, times) { for(var i=0; i<times; i++) f(times+1); }
function repeatedlyInvoke(f, times) {
for (var i = 0; i < times; i++) f(times + 1);
}
function repeat(thing, times) {
var arr = [];
@ -26,42 +73,55 @@ if (jasmine.TrivialConsoleReporter) {
return arr;
}
var fiftyRedFs = repeat(red("F"), 50).join(""),
fiftyGreenDots = repeat(green("."), 50).join("");
function simulateRun(reporter, specResults, suiteResults, finalRunner, startTime, endTime) {
reporter.reportRunnerStarting();
for(var i=0; i<specResults.length; i++) reporter.reportSpecResults(specResults[i]);
for(i=0; i<suiteResults.length; i++) reporter.reportSuiteResults(suiteResults[i]);
for (var i = 0; i < specResults.length; i++) {
reporter.reportSpecResults(specResults[i]);
}
for (i = 0; i < suiteResults.length; i++) {
reporter.reportSuiteResults(suiteResults[i]);
}
reporter.runnerStartTime = startTime;
reporter.now = function(){return endTime;};
reporter.now = function() {
return endTime;
};
reporter.reportRunnerResults(finalRunner);
}
var reporter, out, done;
beforeEach(function() {
this.out = (function(){
out = (function() {
var output = "";
return {
print:function(str) {output += str;},
getOutput:function(){return output;},
clear: function(){output = "";}
print:function(str) {
output += str;
},
getOutput:function() {
return output;
},
clear: function() {
output = "";
}
};
})();
this.done = false
var self = this
this.reporter = new jasmine.TrivialConsoleReporter(this.out.print, function(runner){
self.done = true
done = false;
reporter = new jasmine.TrivialConsoleReporter(out.print, function(runner) {
done = true
});
});
describe('Integration', function() {
it("prints the proper output under a pass scenario. small numbers.", function() {
simulateRun(this.reporter,
simulateRun(reporter,
repeat(passingSpec, 3),
[],
{
specs: function() {
return [null, null, null];
},
results:function() {
return {
items_: [null, null, null],
@ -71,9 +131,10 @@ if (jasmine.TrivialConsoleReporter) {
}
},
1000,
1777);
1777
);
expect(this.out.getOutput()).toEqual(
expect(out.getOutput()).toEqual(
[
"Started",
green(".") + green(".") + green("."),
@ -86,10 +147,13 @@ if (jasmine.TrivialConsoleReporter) {
});
it("prints the proper output under a pass scenario. large numbers.", function() {
simulateRun(this.reporter,
simulateRun(reporter,
repeat(passingSpec, 57),
[],
{
specs: function() {
return [null, null, null];
},
results:function() {
return {
items_: [null, null, null],
@ -101,7 +165,7 @@ if (jasmine.TrivialConsoleReporter) {
1000,
1777);
expect(this.out.getOutput()).toEqual(
expect(out.getOutput()).toEqual(
[
"Started",
@ -114,7 +178,7 @@ if (jasmine.TrivialConsoleReporter) {
green(".") + green(".") + green(".") + green(".") + green(".") +
green(".") + green(".") + green(".") + green(".") + green(".") +
green(".") + green(".") + green(".") + green(".") + green(".") +
green(".") + green(".") + green(".") + green(".") + green(".") + newline +
green(".") + green(".") + green(".") + green(".") + green(".") +
green(".") + green(".") + green(".") + green(".") + green(".") + //7 green dots
green(".") + green("."),
@ -129,9 +193,10 @@ if (jasmine.TrivialConsoleReporter) {
it("prints the proper output under a failure scenario.", function() {
simulateRun(this.reporter,
simulateRun(reporter,
[failingSpec, passingSpec, failingSpec],
[{description:"The oven",
[
{description:"The oven",
results:function() {
return {
items_:[
@ -158,6 +223,9 @@ if (jasmine.TrivialConsoleReporter) {
}}
],
{
specs: function() {
return [null, null, null];
},
results:function() {
return {
items_: [null, null, null],
@ -169,7 +237,7 @@ if (jasmine.TrivialConsoleReporter) {
1000,
1777);
expect(this.out.getOutput()).toEqual(
expect(out.getOutput()).toEqual(
[
"Started",
red("F") + green(".") + red("F"),
@ -188,98 +256,76 @@ if (jasmine.TrivialConsoleReporter) {
].join("\n") + "\n"
);
});
});
describe('A Test Run', function(){
describe('Starts', function(){
it("prints Started", function(){
this.reporter.reportRunnerStarting();
expect(this.out.getOutput()).toEqual(
"Started" + newline
);
});
describe('When a Jasmine environment executes', function() {
beforeEach(function() {
reporter.reportRunnerStarting();
});
it("should print 'Started' to the console", function() {
expect(out.getOutput()).toEqual("Started" + newline);
});
describe('when a spec reports', function() {
beforeEach(function() {
out.clear();
});
describe('A spec runs', function(){
it("prints a green dot if the spec passes", function() {
this.reporter.reportSpecResults(passingSpec);
reporter.reportSpecResults(passingSpec);
expect(this.out.getOutput()).toEqual(
green(".")
);
expect(out.getOutput()).toEqual(green("."));
});
it("prints a red dot if the spec fails", function() {
this.reporter.reportSpecResults(failingSpec);
reporter.reportSpecResults(failingSpec);
expect(this.out.getOutput()).toEqual(
red("F")
);
expect(out.getOutput()).toEqual(red("F"));
});
it("prints a yellow star if the spec was skipped", function() {
this.reporter.reportSpecResults(skippedSpec);
reporter.reportSpecResults(skippedSpec);
expect(this.out.getOutput()).toEqual(
yellow("*")
);
expect(out.getOutput()).toEqual(yellow("*"));
});
});
describe('Many specs run', function(){
it("starts a new line every 50 specs", function(){
var self = this;
repeatedlyInvoke(function(){self.reporter.reportSpecResults(failingSpec);}, 49);
expect(this.out.getOutput()).
toEqual(repeat(red("F"), 49).join(""));
repeatedlyInvoke(function(){self.reporter.reportSpecResults(failingSpec);}, 3);
expect(this.out.getOutput()).
toEqual(fiftyRedFs + newline +
red("F") + red("F"));
repeatedlyInvoke(function(){self.reporter.reportSpecResults(failingSpec);}, 48);
repeatedlyInvoke(function(){self.reporter.reportSpecResults(passingSpec);}, 2);
expect(this.out.getOutput()).
toEqual(fiftyRedFs + newline +
fiftyRedFs + newline +
green(".") + green("."));
});
describe('when a suite reports', function() {
var emptyResults;
beforeEach(function() {
emptyResults = function() {
return {
items_:[]
};
};
});
describe('A suite runs', function(){
it("remembers suite results", function() {
var emptyResults = function(){return {items_:[]};};
this.reporter.reportSuiteResults({description:"Oven", results:emptyResults});
this.reporter.reportSuiteResults({description:"Mixer", results:emptyResults});
reporter.reportSuiteResults({description: "Oven", results: emptyResults});
reporter.reportSuiteResults({description: "Mixer", results: emptyResults});
var self = this;
var descriptions = [];
for(var i=0; i<self.reporter.suiteResults.length; i++)
descriptions.push(self.reporter.suiteResults[i].description);
expect(descriptions).toEqual(["Oven", "Mixer"]);
expect(reporter.suiteResults[0].description).toEqual('Oven');
expect(reporter.suiteResults[1].description).toEqual('Mixer');
});
it("creates a description out of the current suite and any parent suites", function() {
var emptyResults = function(){return {items_:[]};};
var grandparentSuite = {description:"My house", results:emptyResults};
var parentSuite = {description:"kitchen", parentSuite: grandparentSuite, results:emptyResults};
this.reporter.reportSuiteResults({description:"oven", parentSuite: parentSuite, results:emptyResults});
var grandparentSuite = {
description: "My house",
results: emptyResults
};
var parentSuite = {
description: "kitchen",
parentSuite: grandparentSuite,
results: emptyResults
};
reporter.reportSuiteResults({ description: "oven", parentSuite: parentSuite, results: emptyResults });
expect(this.reporter.suiteResults[0].description).toEqual("My house kitchen oven");
expect(reporter.suiteResults[0].description).toEqual("My house kitchen oven");
});
it("gathers failing spec results from the suite. the spec must have a description.", function(){
this.reporter.reportSuiteResults({description:"Oven",
it("gathers failing spec results from the suite - the spec must have a description.", function() {
reporter.reportSuiteResults({description:"Oven",
results: function() {
return {
items_:[
@ -292,7 +338,7 @@ if (jasmine.TrivialConsoleReporter) {
};
}});
expect(this.reporter.suiteResults[0].failedSpecResults).
expect(reporter.suiteResults[0].failedSpecResults).
toEqual([
{ failedCount: 99, description: "specTwo" },
{ failedCount: 88, description: "specFour" }
@ -301,12 +347,12 @@ if (jasmine.TrivialConsoleReporter) {
});
describe('Finishes', function(){
describe('and finishes', function() {
describe('Spec failure information', function(){
describe('when reporting spec failure information', function() {
it("prints suite and spec descriptions together as a sentence", function() {
this.reporter.suiteResults = [
reporter.suiteResults = [
{description:"The oven", failedSpecResults:[
{description:"heats up", items_:[]},
{description:"cleans itself", items_:[]}
@ -316,15 +362,15 @@ if (jasmine.TrivialConsoleReporter) {
]}
];
this.reporter.reportRunnerResults(failingRun);
reporter.reportRunnerResults(failingRun);
expect(this.out.getOutput()).toContain("The oven heats up");
expect(this.out.getOutput()).toContain("The oven cleans itself");
expect(this.out.getOutput()).toContain("The mixer blends things together");
expect(out.getOutput()).toContain("The oven heats up");
expect(out.getOutput()).toContain("The oven cleans itself");
expect(out.getOutput()).toContain("The mixer blends things together");
});
it("prints stack trace of spec failure", function() {
this.reporter.suiteResults = [
reporter.suiteResults = [
{description:"The oven", failedSpecResults:[
{description:"heats up",
items_:[
@ -334,98 +380,111 @@ if (jasmine.TrivialConsoleReporter) {
]}
];
this.reporter.reportRunnerResults(failingRun);
reporter.reportRunnerResults(failingRun);
expect(this.out.getOutput()).toContain("The oven heats up");
expect(this.out.getOutput()).toContain("stack trace one");
expect(this.out.getOutput()).toContain("stack trace two");
expect(out.getOutput()).toContain("The oven heats up");
expect(out.getOutput()).toContain("stack trace one");
expect(out.getOutput()).toContain("stack trace two");
});
});
describe('Finished line', function(){
describe('when reporting the execution time', function() {
it("prints the elapsed time in the summary message", function(){
this.reporter.now = function(){return 1000;};
this.reporter.reportRunnerStarting();
this.reporter.now = function(){return 1777;};
this.reporter.reportRunnerResults(passingRun);
expect(this.out.getOutput()).toContain("0.777 seconds");
it("prints the full finished message", function() {
reporter.now = function() {
return 1000;
};
reporter.reportRunnerStarting();
reporter.now = function() {
return 1777;
};
reporter.reportRunnerResults(failingRun);
expect(out.getOutput()).toContain("Finished in 0.777 seconds");
});
it("prints round time numbers correctly", function() {
var self = this;
function run(startTime, endTime) {
self.out.clear();
self.reporter.runnerStartTime = startTime;
self.reporter.now = function(){return endTime;};
self.reporter.reportRunnerResults(passingRun);
out.clear();
reporter.runnerStartTime = startTime;
reporter.now = function() {
return endTime;
};
reporter.reportRunnerResults(passingRun);
}
run(1000, 11000);
expect(this.out.getOutput()).toContain("10 seconds");
expect(out.getOutput()).toContain("10 seconds");
run(1000, 2000);
expect(this.out.getOutput()).toContain("1 seconds");
expect(out.getOutput()).toContain("1 seconds");
run(1000, 1100);
expect(this.out.getOutput()).toContain("0.1 seconds");
expect(out.getOutput()).toContain("0.1 seconds");
run(1000, 1010);
expect(this.out.getOutput()).toContain("0.01 seconds");
expect(out.getOutput()).toContain("0.01 seconds");
run(1000, 1001);
expect(this.out.getOutput()).toContain("0.001 seconds");
});
it("prints the full finished message", function(){
this.reporter.now = function(){return 1000;};
this.reporter.reportRunnerStarting();
this.reporter.now = function(){return 1777;};
this.reporter.reportRunnerResults(failingRun);
expect(this.out.getOutput()).toContain("Finished in 0.777 seconds");
expect(out.getOutput()).toContain("0.001 seconds");
});
});
describe("specs/expectations/failures summary", function(){
describe("when reporting the results summary", function() {
it("prints statistics in green if there were no failures", function() {
this.reporter.reportRunnerResults({
results:function(){return {items_: [null, null, null], totalCount: 7, failedCount: 0};}
reporter.reportRunnerResults({
specs: function() {
return [null, null, null];
},
results:function() {
return {items_: [null, null, null], totalCount: 7, failedCount: 0};
}
});
expect(this.out.getOutput()).
expect(out.getOutput()).
toContain("3 specs, 7 expectations, 0 failures");
});
it("prints statistics in red if there was a failure", function() {
this.reporter.reportRunnerResults({
results:function(){return {items_: [null, null, null], totalCount: 7, failedCount: 3};}
reporter.reportRunnerResults({
specs: function() {
return [null, null, null];
},
results:function() {
return {items_: [null, null, null], totalCount: 7, failedCount: 3};
}
});
expect(this.out.getOutput()).
expect(out.getOutput()).
toContain("3 specs, 7 expectations, 3 failures");
});
it("handles pluralization with 1's ones appropriately", function() {
this.reporter.reportRunnerResults({
results:function(){return {items_: [null], totalCount: 1, failedCount: 1};}
reporter.reportRunnerResults({
specs: function() {
return [null];
},
results:function() {
return {items_: [null], totalCount: 1, failedCount: 1};
}
});
expect(this.out.getOutput()).
expect(out.getOutput()).
toContain("1 spec, 1 expectation, 1 failure");
});
});
describe("done callback", function() {
it("calls back when done", function() {
expect(this.done).toBeFalsy();
this.reporter.reportRunnerResults({
results:function(){return {items_: [null, null, null], totalCount: 7, failedCount: 0};}
});
expect(this.done).toBeTruthy();
});
});
});
});
});
expect(done).toBeFalsy();
reporter.reportRunnerResults({
specs: function() {
return [null, null, null];
},
results:function() {
return {items_: [null, null, null], totalCount: 7, failedCount: 0};
}
});
expect(done).toBeTruthy();
});
});
});
});
});

103
src/console/TrivialConsoleReporter.js
View File

@ -2,34 +2,71 @@ jasmine.TrivialConsoleReporter = function(print, doneCallback) {
//inspired by mhevery's jasmine-node reporter
//https://github.com/mhevery/jasmine-node
doneCallback = doneCallback || function(){};
doneCallback = doneCallback || function() {
};
var defaultColumnsPerLine = 50,
ansi = { green: '\033[32m', red: '\033[31m', yellow: '\033[33m', none: '\033[0m' },
language = { spec:"spec", expectation:"expectation", failure:"failure" };
ansi = {
green: '\033[32m',
red: '\033[31m',
yellow: '\033[33m',
none: '\033[0m'
},
language = {
spec: "spec",
expectation: "expectation",
failure: "failure"
};
function coloredStr(color, str) { return ansi[color] + str + ansi.none; }
function coloredStr(color, str) {
return ansi[color] + str + ansi.none;
}
function greenStr(str) { return coloredStr("green", str); }
function redStr(str) { return coloredStr("red", str); }
function yellowStr(str) { return coloredStr("yellow", str); }
function greenStr(str) {
return coloredStr("green", str);
}
function newline() { print("\n"); }
function started() { print("Started");
newline(); }
function redStr(str) {
return coloredStr("red", str);
}
function greenDot() { print(greenStr(".")); }
function redF() { print(redStr("F")); }
function yellowStar() { print(yellowStr("*")); }
function yellowStr(str) {
return coloredStr("yellow", str);
}
function plural(str, count) { return count == 1 ? str : str + "s"; }
function newline() {
print("\n");
}
function repeat(thing, times) { var arr = [];
function started() {
print("Started");
newline();
}
function greenDot() {
print(greenStr("."));
}
function redF() {
print(redStr("F"));
}
function yellowStar() {
print(yellowStr("*"));
}
function plural(str, count) {
return count == 1 ? str : str + "s";
}
function repeat(thing, times) {
var arr = [];
for (var i = 0; i < times; i++) arr.push(thing);
return arr;
}
function indent(str, spaces) { var lines = str.split("\n");
function indent(str, spaces) {
var lines = (str || '').split("\n");
var newArr = [];
for (var i = 0; i < lines.length; i++) {
newArr.push(repeat(" ", spaces).join("") + lines[i]);
@ -46,19 +83,28 @@ jasmine.TrivialConsoleReporter = function(print, doneCallback) {
newline();
}
}
function finished(elapsed) { newline();
print("Finished in " + elapsed/1000 + " seconds"); }
function summary(colorF, specs, expectations, failed) { newline();
function finished(elapsed) {
newline();
print("Finished in " + elapsed / 1000 + " seconds");
}
function summary(colorF, specs, expectations, failed) {
newline();
print(colorF(specs + " " + plural(language.spec, specs) + ", " +
expectations + " " + plural(language.expectation, expectations) + ", " +
failed + " " + plural(language.failure, failed)));
newline();
newline(); }
function greenSummary(specs, expectations, failed){ summary(greenStr, specs, expectations, failed); }
function redSummary(specs, expectations, failed){ summary(redStr, specs, expectations, failed); }
newline();
}
function greenSummary(specs, expectations, failed) {
summary(greenStr, specs, expectations, failed);
}
function redSummary(specs, expectations, failed) {
summary(redStr, specs, expectations, failed);
}
function lineEnder(columnsPerLine) {
var columnsSoFar = 0;
@ -79,14 +125,17 @@ jasmine.TrivialConsoleReporter = function(print, doneCallback) {
var startNewLineIfNecessary = lineEnder(defaultColumnsPerLine);
this.now = function() { return new Date().getTime(); };
this.now = function() {
return new Date().getTime();
};
this.reportRunnerStarting = function() {
this.runnerStartTime = this.now();
started();
};
this.reportSpecStarting = function() { /* do nothing */ };
this.reportSpecStarting = function() { /* do nothing */
};
this.reportSpecResults = function(spec) {
var results = spec.results();
@ -97,7 +146,7 @@ jasmine.TrivialConsoleReporter = function(print, doneCallback) {
} else {
redF();
}
startNewLineIfNecessary();
// startNewLineIfNecessary();
};
this.suiteResults = [];
@ -138,7 +187,7 @@ jasmine.TrivialConsoleReporter = function(print, doneCallback) {
var results = runner.results();
var summaryFunction = results.failedCount === 0 ? greenSummary : redSummary;
summaryFunction(results.items_.length, results.totalCount, results.failedCount);
summaryFunction(runner.specs().length, results.totalCount, results.failedCount);
doneCallback(runner);
};
};