Skip to content

Commit 617b323

Browse files
committed
Replace old, vendored Jasmine with current npm package.
JSDoc-specific test functions are now properties of a `jsdoc` global, not a `jasmine` global. Also updates license files to reflect the fact that we no longer vendor anything.
1 parent 9d0d86f commit 617b323

File tree

173 files changed

+1055
-4185
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

173 files changed

+1055
-4185
lines changed
File renamed without changes.

LICENSE.md

-72
This file was deleted.

cli.js

+19-23
Original file line numberDiff line numberDiff line change
@@ -117,22 +117,26 @@ module.exports = (() => {
117117
cli.exit(1);
118118
}
119119

120-
if (env.opts.debug) {
121-
logger.setLevel(logger.LEVELS.DEBUG);
122-
}
123-
else if (env.opts.verbose) {
124-
logger.setLevel(logger.LEVELS.INFO);
125-
}
120+
if (env.opts.test) {
121+
logger.setLevel(logger.LEVELS.SILENT);
122+
} else {
123+
if (env.opts.debug) {
124+
logger.setLevel(logger.LEVELS.DEBUG);
125+
}
126+
else if (env.opts.verbose) {
127+
logger.setLevel(logger.LEVELS.INFO);
128+
}
126129

127-
if (env.opts.pedantic) {
128-
logger.once('logger:warn', recoverableError);
129-
logger.once('logger:error', fatalError);
130-
}
131-
else {
132-
logger.once('logger:error', recoverableError);
133-
}
130+
if (env.opts.pedantic) {
131+
logger.once('logger:warn', recoverableError);
132+
logger.once('logger:error', fatalError);
133+
}
134+
else {
135+
logger.once('logger:error', recoverableError);
136+
}
134137

135-
logger.once('logger:fatal', fatalError);
138+
logger.once('logger:fatal', fatalError);
139+
}
136140

137141
return cli;
138142
};
@@ -201,15 +205,7 @@ module.exports = (() => {
201205
};
202206

203207
// TODO: docs
204-
cli.runTests = () => {
205-
const path = require('jsdoc/path');
206-
207-
const runner = Promise.promisify(require( path.join(env.dirname, 'test/runner') ));
208-
209-
console.log('Running tests...');
210-
211-
return runner();
212-
};
208+
cli.runTests = () => require('./test')();
213209

214210
// TODO: docs
215211
cli.getVersion = () => `JSDoc ${env.version.number} (${env.version.revision})`;

jsdoc.js

+3-7
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,9 @@ global.app = (() => require('./lib/jsdoc/app'))();
6464
}
6565

6666
cli.setVersionInfo()
67-
.loadConfig();
68-
69-
if (!env.opts.test) {
70-
cli.configureLogger();
71-
}
72-
73-
cli.logStart();
67+
.loadConfig()
68+
.configureLogger()
69+
.logStart();
7470

7571
if (env.opts.debug) {
7672
/**

package-lock.json

+137-19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)