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

move all "assertion" to "expectation"

This commit is contained in:
Davis W. Frank 2011-03-08 18:37:44 -08:00
parent ccfa17499f
commit 70aed2d900
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spec/suites/SpecRunningSpec.js
View File

@ -54,7 +54,7 @@ describe("jasmine spec running", function () {
this.expect(foo).toEqual('baz'); this.expect(foo).toEqual('baz');
}); });
specWithMultipleExpectations = env.it('spec with multiple assertions').runs(function () { specWithMultipleExpectations = env.it('spec with multiple expectations').runs(function () {
var foo = 'bar'; var foo = 'bar';
var baz = 'quux'; var baz = 'quux';

14
spec/suites/TrivialConsoleReporterSpec.js
View File

@ -78,7 +78,7 @@ describe("TrivialConsoleReporter", function() {
green(".") + green(".") + green("."), green(".") + green(".") + green("."),
"", "",
"Finished in 0.777 seconds", "Finished in 0.777 seconds",
green("3 specs, 7 assertions, 0 failures"), green("3 specs, 7 expectations, 0 failures"),
"" ""
].join("\n") + "\n" ].join("\n") + "\n"
); );
@ -120,7 +120,7 @@ describe("TrivialConsoleReporter", function() {
"", "",
"Finished in 0.777 seconds", "Finished in 0.777 seconds",
green("3 specs, 7 assertions, 0 failures"), green("3 specs, 7 expectations, 0 failures"),
"" ""
].join("\n") + "\n" ].join("\n") + "\n"
); );
@ -182,7 +182,7 @@ describe("TrivialConsoleReporter", function() {
" stack trace one", " stack trace one",
"", "",
"Finished in 0.777 seconds", "Finished in 0.777 seconds",
red("3 specs, 7 assertions, 2 failures"), red("3 specs, 7 expectations, 2 failures"),
"" ""
].join("\n") + "\n" ].join("\n") + "\n"
); );
@ -386,13 +386,13 @@ describe("TrivialConsoleReporter", function() {
}); });
}); });
describe("specs/assertions/failures summary", function(){ describe("specs/expectations/failures summary", function(){
it("prints statistics in green if there were no failures", function() { it("prints statistics in green if there were no failures", function() {
this.reporter.reportRunnerResults({ this.reporter.reportRunnerResults({
results:function(){return {items_: [null, null, null], totalCount: 7, failedCount: 0};} results:function(){return {items_: [null, null, null], totalCount: 7, failedCount: 0};}
}); });
expect(this.out.getOutput()). expect(this.out.getOutput()).
toContain("3 specs, 7 assertions, 0 failures"); toContain("3 specs, 7 expectations, 0 failures");
}); });
it("prints statistics in red if there was a failure", function() { it("prints statistics in red if there was a failure", function() {
@ -400,7 +400,7 @@ describe("TrivialConsoleReporter", function() {
results:function(){return {items_: [null, null, null], totalCount: 7, failedCount: 3};} results:function(){return {items_: [null, null, null], totalCount: 7, failedCount: 3};}
}); });
expect(this.out.getOutput()). expect(this.out.getOutput()).
toContain("3 specs, 7 assertions, 3 failures"); toContain("3 specs, 7 expectations, 3 failures");
}); });
it("handles pluralization with 1's ones appropriately", function() { it("handles pluralization with 1's ones appropriately", function() {
@ -408,7 +408,7 @@ describe("TrivialConsoleReporter", function() {
results:function(){return {items_: [null], totalCount: 1, failedCount: 1};} results:function(){return {items_: [null], totalCount: 1, failedCount: 1};}
}); });
expect(this.out.getOutput()). expect(this.out.getOutput()).
toContain("1 spec, 1 assertion, 1 failure"); toContain("1 spec, 1 expectation, 1 failure");
}); });
}); });

10
src/console/TrivialConsoleReporter.js
View File

@ -6,7 +6,7 @@ jasmine.TrivialConsoleReporter = function(print, doneCallback) {
var defaultColumnsPerLine = 50, var defaultColumnsPerLine = 50,
ansi = { green: '\033[32m', red: '\033[31m', yellow: '\033[33m', none: '\033[0m' }, ansi = { green: '\033[32m', red: '\033[31m', yellow: '\033[33m', none: '\033[0m' },
language = { spec:"spec", assertion:"assertion", failure:"failure" }; 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; }
@ -48,14 +48,14 @@ jasmine.TrivialConsoleReporter = function(print, doneCallback) {
} }
function finished(elapsed) { newline(); function finished(elapsed) { newline();
print("Finished in " + elapsed/1000 + " seconds"); } print("Finished in " + elapsed/1000 + " seconds"); }
function summary(colorF, specs, assertions, failed) { newline(); function summary(colorF, specs, expectations, failed) { newline();
print(colorF(specs + " " + plural(language.spec, specs) + ", " + print(colorF(specs + " " + plural(language.spec, specs) + ", " +
assertions + " " + plural(language.assertion, assertions) + ", " + expectations + " " + plural(language.expectation, expectations) + ", " +
failed + " " + plural(language.failure, failed))); failed + " " + plural(language.failure, failed)));
newline(); newline();
newline(); } newline(); }
function greenSummary(specs, assertions, failed){ summary(greenStr, specs, assertions, failed); } function greenSummary(specs, expectations, failed){ summary(greenStr, specs, expectations, failed); }
function redSummary(specs, assertions, failed){ summary(redStr, specs, assertions, failed); } function redSummary(specs, expectations, failed){ summary(redStr, specs, expectations, failed); }