archive-gh-me/jsdoc
1
0
Fork 0
mirror of https://github.com/jsdoc/jsdoc.git synced 2025-12-08 19:46:11 +00:00
Code Issues Projects Releases Wiki Activity

minor cleanup, mainly console.log = function () {} --> spyOn(console, 'log')

Browse Source
This commit is contained in:
mathematicalcoffee 2013-02-22 12:45:04 +10:00
parent 7c497b0580
commit 32fe768ea7
3 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/jsdoc/tutorial/resolver.js
View File

@ -159,7 +159,6 @@ exports.load = function(_path) {
exports.resolve = function() { exports.resolve = function() {
var item, var item,
current; current;
//console.log(tutorials);
for (var name in conf) { for (var name in conf) {
if ( hasOwnProp.call(conf, name) ) { if ( hasOwnProp.call(conf, name) ) {
// TODO: should we complain about this? // TODO: should we complain about this?

6
test/specs/jsdoc/util/error.js
View File

@ -15,8 +15,7 @@ describe("jsdoc/util/error", function() {
describe("handle", function() { describe("handle", function() {
/*jshint evil: true */ /*jshint evil: true */
var lenient = !!env.opts.lenient, var lenient = !!env.opts.lenient;
log = eval(console.log);
function handleError() { function handleError() {
handle( new Error("foo") ); handle( new Error("foo") );
@ -28,7 +27,6 @@ describe("jsdoc/util/error", function() {
afterEach(function() { afterEach(function() {
env.opts.lenient = lenient; env.opts.lenient = lenient;
console.log = log;
}); });
it("should re-throw errors by default", function() { it("should re-throw errors by default", function() {
@ -43,7 +41,7 @@ describe("jsdoc/util/error", function() {
it("should not re-throw errors if lenient mode is enabled", function() { it("should not re-throw errors if lenient mode is enabled", function() {
env.opts.lenient = true; env.opts.lenient = true;
console.log = function() {}; spyOn(console, 'log');
expect(handleError).not.toThrow(); expect(handleError).not.toThrow();
}); });

23
test/specs/jsdoc/util/templateHelper.js
View File

@ -124,7 +124,6 @@ describe("jsdoc/util/templateHelper", function() {
describe("setTutorials", function() { describe("setTutorials", function() {
// all it does is set var tutorials = root, how to test that?!
// used in tutorialToUrl, toTutorial. // used in tutorialToUrl, toTutorial.
it("setting tutorials to null causes all tutorial lookups to fail", function() { it("setting tutorials to null causes all tutorial lookups to fail", function() {
// bit of a dodgy test but the best I can manage. setTutorials doesn't do much. // bit of a dodgy test but the best I can manage. setTutorials doesn't do much.
@ -134,12 +133,11 @@ describe("jsdoc/util/templateHelper", function() {
}); });
it("setting tutorials to the root tutorial object lets lookups work", function() { it("setting tutorials to the root tutorial object lets lookups work", function() {
var lenient = !!env.opts.lenient, var lenient = !!env.opts.lenient;
log = eval(console.log); spyOn(console, 'log');
// tutorial doesn't exist, we want to muffle that error // tutorial doesn't exist, we want to muffle that error
env.opts.lenient = true; env.opts.lenient = true;
console.log = function () {};
helper.setTutorials(resolver.root); helper.setTutorials(resolver.root);
spyOn(resolver.root, 'getByName'); spyOn(resolver.root, 'getByName');
@ -147,7 +145,6 @@ describe("jsdoc/util/templateHelper", function() {
expect(resolver.root.getByName).toHaveBeenCalled(); expect(resolver.root.getByName).toHaveBeenCalled();
env.opts.lenient = lenient; env.opts.lenient = lenient;
console.log = log;
}); });
}); });
@ -811,21 +808,20 @@ describe("jsdoc/util/templateHelper", function() {
describe("tutorialToUrl", function() { describe("tutorialToUrl", function() {
/*jshint evil: true */ /*jshint evil: true */
var lenient = !!env.opts.lenient, var lenient = !!env.opts.lenient;
log = eval(console.log);
function missingTutorial() { function missingTutorial() {
var url = helper.tutorialToUrl("be-a-perfect-person-in-just-three-days"); var url = helper.tutorialToUrl("be-a-perfect-person-in-just-three-days");
} }
beforeEach(function() { beforeEach(function() {
spyOn(console, 'log');
helper.setTutorials(resolver.root); helper.setTutorials(resolver.root);
}); });
afterEach(function() { afterEach(function() {
helper.setTutorials(null); helper.setTutorials(null);
env.opts.lenient = lenient; env.opts.lenient = lenient;
console.log = log;
}); });
it('throws an exception if the tutorial is missing and the lenient option is not enabled', function() { it('throws an exception if the tutorial is missing and the lenient option is not enabled', function() {
@ -834,14 +830,12 @@ describe("jsdoc/util/templateHelper", function() {
}); });
it('does not throw an exception if the tutorial is missing and the lenient option is enabled', function() { it('does not throw an exception if the tutorial is missing and the lenient option is enabled', function() {
console.log = function() {};
env.opts.lenient = true; env.opts.lenient = true;
expect(missingTutorial).not.toThrow(); expect(missingTutorial).not.toThrow();
}); });
it("does not return a tutorial if its name is a reserved JS keyword and it doesn't exist", function() { it("does not return a tutorial if its name is a reserved JS keyword and it doesn't exist", function() {
console.log = function () {};
env.opts.lenient = false; env.opts.lenient = false;
expect(function () { helper.tutorialToUrl('prototype') }).toThrow(); expect(function () { helper.tutorialToUrl('prototype') }).toThrow();
}); });
@ -851,7 +845,6 @@ describe("jsdoc/util/templateHelper", function() {
// cry when trying to resolve the same set of tutorials twice (once // cry when trying to resolve the same set of tutorials twice (once
// for the tutorials tests, and once here). // for the tutorials tests, and once here).
env.opts.lenient = true; env.opts.lenient = true;
console.log = function() {};
// load the tutorials we already have for the tutorials tests // load the tutorials we already have for the tutorials tests
resolver.load(__dirname + "/test/tutorials/tutorials"); resolver.load(__dirname + "/test/tutorials/tutorials");
@ -876,8 +869,7 @@ describe("jsdoc/util/templateHelper", function() {
describe("toTutorial", function() { describe("toTutorial", function() {
/*jshint evil: true */ /*jshint evil: true */
var lenient = !!env.opts.lenient, var lenient = !!env.opts.lenient;
log = eval(console.log);
function missingParam() { function missingParam() {
helper.toTutorial(); helper.toTutorial();
@ -885,7 +877,6 @@ describe("jsdoc/util/templateHelper", function() {
afterEach(function() { afterEach(function() {
env.opts.lenient = lenient; env.opts.lenient = lenient;
console.log = log;
helper.setTutorials(null); helper.setTutorials(null);
}); });
@ -900,7 +891,7 @@ describe("jsdoc/util/templateHelper", function() {
}); });
it('does not throw an exception if the first param is missing and the lenient option is enabled', function() { it('does not throw an exception if the first param is missing and the lenient option is enabled', function() {
console.log = function() {}; spyOn(console, 'log');
env.opts.lenient = true; env.opts.lenient = true;
expect(missingParam).not.toThrow(); expect(missingParam).not.toThrow();
@ -943,7 +934,7 @@ describe("jsdoc/util/templateHelper", function() {
// cry when trying to resolve the same set of tutorials twice (once // cry when trying to resolve the same set of tutorials twice (once
// for the tutorials tests, and once here). // for the tutorials tests, and once here).
env.opts.lenient = true; env.opts.lenient = true;
console.log = function() {}; spyOn(console, 'log');
// load the tutorials we already have for the tutorials tests // load the tutorials we already have for the tutorials tests
resolver.load(__dirname + "/test/tutorials/tutorials"); resolver.load(__dirname + "/test/tutorials/tutorials");