mirror of
https://github.com/chaijs/chai
synced 2024-11-14 15:57:10 +00:00
Release 0.5.3
This commit is contained in:
Jake Luer
parent
1af894f21f
commit
dd66ecbfd8
9 changed files with 432 additions and 61 deletions
15
History.md
15
History.md
|
|
@ -1,4 +1,19 @@
|
|||
|
||||
0.5.3 / 2012-04-21
|
||||
==================
|
||||
|
||||
* Merge branch 'refs/heads/jgonera-oldbrowsers'
|
||||
* browser build
|
||||
* fixed reserved names for old browsers in interface/assert
|
||||
* fixed reserved names for old browsers in interface/should
|
||||
* fixed: chai.js no longer contains fail()
|
||||
* fixed reserved names for old browsers in Assertion
|
||||
* Merge pull request #49 from joliss/build-order
|
||||
* Make order of source files well-defined
|
||||
* Merge pull request #43 from zzen/patch-1
|
||||
* Support for expected and actual parameters in assert-style error object
|
||||
* chai as promised - readme
|
||||
|
||||
0.5.2 / 2012-03-21
|
||||
==================
|
||||
|
||||
|
|
|
|||
2
chai.js
2
chai.js
|
|
@ -1079,7 +1079,7 @@ require.register("chai.js", function(module, exports, require){
|
|||
var used = [];
|
||||
var exports = module.exports = {};
|
||||
|
||||
exports.version = '0.5.2';
|
||||
exports.version = '0.5.3';
|
||||
|
||||
exports.Assertion = require('./assertion');
|
||||
exports.AssertionError = require('./error');
|
||||
|
|
|
|||
|
|
@ -634,13 +634,13 @@ Assertion.prototype.a = function (type) {
|
|||
*
|
||||
* expect(Chai).to.be.an.instanceOf(Tea);
|
||||
*
|
||||
* @name instanceof
|
||||
* @name instanceOf
|
||||
* @param {Constructor}
|
||||
* @alias instanceOf
|
||||
* @api public
|
||||
*/
|
||||
|
||||
Assertion.prototype.instanceof = function (constructor) {
|
||||
Assertion.prototype.instanceOf = function (constructor) {
|
||||
var name = constructor.name;
|
||||
this.assert(
|
||||
this.obj instanceof constructor
|
||||
|
|
@ -921,7 +921,7 @@ Assertion.prototype.keys = function(keys) {
|
|||
* @api public
|
||||
*/
|
||||
|
||||
Assertion.prototype.throw = function (constructor, msg) {
|
||||
Assertion.prototype.Throw = function (constructor, msg) {
|
||||
new Assertion(this.obj).is.a('function');
|
||||
|
||||
var thrown = false;
|
||||
|
|
@ -1063,9 +1063,9 @@ Assertion.prototype.closeTo = function (expected, delta) {
|
|||
('ownProperty', 'haveOwnProperty')
|
||||
('above', 'greaterThan')
|
||||
('below', 'lessThan')
|
||||
('throw', 'throws')
|
||||
('throw', 'Throw') // for troublesome browsers
|
||||
('instanceof', 'instanceOf');
|
||||
('Throw', 'throws')
|
||||
('Throw', 'throw') // for troublesome browsers
|
||||
('instanceOf', 'instanceof');
|
||||
|
||||
}); // module: assertion.js
|
||||
|
||||
|
|
@ -1079,7 +1079,7 @@ require.register("chai.js", function(module, exports, require){
|
|||
var used = [];
|
||||
var exports = module.exports = {};
|
||||
|
||||
exports.version = '0.5.2';
|
||||
exports.version = '0.5.3';
|
||||
|
||||
exports.Assertion = require('./assertion');
|
||||
exports.AssertionError = require('./error');
|
||||
|
|
@ -1113,8 +1113,6 @@ require.register("error.js", function(module, exports, require){
|
|||
* MIT Licensed
|
||||
*/
|
||||
|
||||
var fail = require('./chai').fail;
|
||||
|
||||
module.exports = AssertionError;
|
||||
|
||||
/*!
|
||||
|
|
@ -1128,10 +1126,9 @@ function AssertionError (options) {
|
|||
this.actual = options.actual;
|
||||
this.expected = options.expected;
|
||||
this.operator = options.operator;
|
||||
var stackStartFunction = options.stackStartFunction || fail;
|
||||
|
||||
if (Error.captureStackTrace) {
|
||||
Error.captureStackTrace(this, stackStartFunction);
|
||||
Error.captureStackTrace(this, options.stackStartFunction);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1248,7 +1245,10 @@ module.exports = function (chai) {
|
|||
test.assert(
|
||||
exp == test.obj
|
||||
, 'expected ' + test.inspect + ' to equal ' + inspect(exp)
|
||||
, 'expected ' + test.inspect + ' to not equal ' + inspect(exp));
|
||||
, 'expected ' + test.inspect + ' to not equal ' + inspect(exp)
|
||||
, exp
|
||||
, act
|
||||
);
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -1271,7 +1271,10 @@ module.exports = function (chai) {
|
|||
test.assert(
|
||||
exp != test.obj
|
||||
, 'expected ' + test.inspect + ' to equal ' + inspect(exp)
|
||||
, 'expected ' + test.inspect + ' to not equal ' + inspect(exp));
|
||||
, 'expected ' + test.inspect + ' to not equal ' + inspect(exp)
|
||||
, exp
|
||||
, act
|
||||
);
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -1361,7 +1364,7 @@ module.exports = function (chai) {
|
|||
*/
|
||||
|
||||
assert.isTrue = function (val, msg) {
|
||||
new Assertion(val, msg).is.true;
|
||||
new Assertion(val, msg).is['true'];
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -1379,7 +1382,7 @@ module.exports = function (chai) {
|
|||
*/
|
||||
|
||||
assert.isFalse = function (val, msg) {
|
||||
new Assertion(val, msg).is.false;
|
||||
new Assertion(val, msg).is['false'];
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -1503,7 +1506,7 @@ module.exports = function (chai) {
|
|||
*/
|
||||
|
||||
assert.isArray = function (val, msg) {
|
||||
new Assertion(val, msg).to.be.instanceof(Array);
|
||||
new Assertion(val, msg).to.be.instanceOf(Array);
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -1599,7 +1602,7 @@ module.exports = function (chai) {
|
|||
*/
|
||||
|
||||
assert.instanceOf = function (val, type, msg) {
|
||||
new Assertion(val, msg).to.be.instanceof(type);
|
||||
new Assertion(val, msg).to.be.instanceOf(type);
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -1688,7 +1691,7 @@ module.exports = function (chai) {
|
|||
type = null;
|
||||
}
|
||||
|
||||
new Assertion(fn, msg).to.throw(type);
|
||||
new Assertion(fn, msg).to.Throw(type);
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -1714,7 +1717,7 @@ module.exports = function (chai) {
|
|||
type = null;
|
||||
}
|
||||
|
||||
new Assertion(fn, msg).to.not.throw(type);
|
||||
new Assertion(fn, msg).to.not.Throw(type);
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -1813,8 +1816,8 @@ module.exports = function (chai) {
|
|||
new Assertion(val1).to.equal(val2);
|
||||
};
|
||||
|
||||
should.throw = function (fn, errt, errs) {
|
||||
new Assertion(fn).to.throw(errt, errs);
|
||||
should.Throw = function (fn, errt, errs) {
|
||||
new Assertion(fn).to.Throw(errt, errs);
|
||||
};
|
||||
|
||||
should.exist = function (val) {
|
||||
|
|
@ -1828,14 +1831,17 @@ module.exports = function (chai) {
|
|||
new Assertion(val1).to.not.equal(val2);
|
||||
};
|
||||
|
||||
should.not.throw = function (fn, errt, errs) {
|
||||
new Assertion(fn).to.not.throw(errt, errs);
|
||||
should.not.Throw = function (fn, errt, errs) {
|
||||
new Assertion(fn).to.not.Throw(errt, errs);
|
||||
};
|
||||
|
||||
should.not.exist = function (val) {
|
||||
new Assertion(val).to.not.exist;
|
||||
}
|
||||
|
||||
should['throw'] = should['Throw'];
|
||||
should.not['throw'] = should.not['Throw'];
|
||||
|
||||
return should;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -285,7 +285,10 @@ _gaq.push(['_trackPageview']);
|
|||
test.assert(
|
||||
exp == test.obj
|
||||
, 'expected ' + test.inspect + ' to equal ' + inspect(exp)
|
||||
, 'expected ' + test.inspect + ' to not equal ' + inspect(exp));
|
||||
, 'expected ' + test.inspect + ' to not equal ' + inspect(exp)
|
||||
, exp
|
||||
, act
|
||||
);
|
||||
};</code>
|
||||
</pre>
|
||||
</div>
|
||||
|
|
@ -322,7 +325,10 @@ _gaq.push(['_trackPageview']);
|
|||
test.assert(
|
||||
exp != test.obj
|
||||
, 'expected ' + test.inspect + ' to equal ' + inspect(exp)
|
||||
, 'expected ' + test.inspect + ' to not equal ' + inspect(exp));
|
||||
, 'expected ' + test.inspect + ' to not equal ' + inspect(exp)
|
||||
, exp
|
||||
, act
|
||||
);
|
||||
};</code>
|
||||
</pre>
|
||||
</div>
|
||||
|
|
@ -481,7 +487,7 @@ _gaq.push(['_trackPageview']);
|
|||
</div>
|
||||
<div class="code-wrap">
|
||||
<pre class="source prettyprint"><code>assert.isTrue = function (val, msg) {
|
||||
new Assertion(val, msg).is.true;
|
||||
new Assertion(val, msg).is['true'];
|
||||
};</code>
|
||||
</pre>
|
||||
</div>
|
||||
|
|
@ -512,7 +518,7 @@ _gaq.push(['_trackPageview']);
|
|||
</div>
|
||||
<div class="code-wrap">
|
||||
<pre class="source prettyprint"><code>assert.isFalse = function (val, msg) {
|
||||
new Assertion(val, msg).is.false;
|
||||
new Assertion(val, msg).is['false'];
|
||||
};</code>
|
||||
</pre>
|
||||
</div>
|
||||
|
|
@ -727,7 +733,7 @@ _gaq.push(['_trackPageview']);
|
|||
</div>
|
||||
<div class="code-wrap">
|
||||
<pre class="source prettyprint"><code>assert.isArray = function (val, msg) {
|
||||
new Assertion(val, msg).to.be.instanceof(Array);
|
||||
new Assertion(val, msg).to.be.instanceOf(Array);
|
||||
};</code>
|
||||
</pre>
|
||||
</div>
|
||||
|
|
@ -890,7 +896,7 @@ _gaq.push(['_trackPageview']);
|
|||
</div>
|
||||
<div class="code-wrap">
|
||||
<pre class="source prettyprint"><code>assert.instanceOf = function (val, type, msg) {
|
||||
new Assertion(val, msg).to.be.instanceof(type);
|
||||
new Assertion(val, msg).to.be.instanceOf(type);
|
||||
};</code>
|
||||
</pre>
|
||||
</div>
|
||||
|
|
@ -1035,7 +1041,7 @@ _gaq.push(['_trackPageview']);
|
|||
type = null;
|
||||
}
|
||||
|
||||
new Assertion(fn, msg).to.throw(type);
|
||||
new Assertion(fn, msg).to.Throw(type);
|
||||
};</code>
|
||||
</pre>
|
||||
</div>
|
||||
|
|
@ -1075,7 +1081,7 @@ _gaq.push(['_trackPageview']);
|
|||
type = null;
|
||||
}
|
||||
|
||||
new Assertion(fn, msg).to.not.throw(type);
|
||||
new Assertion(fn, msg).to.not.Throw(type);
|
||||
};</code>
|
||||
</pre>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ _gaq.push(['_trackPageview']);
|
|||
</li>
|
||||
<li class="keepcase"><a href="#a" class="scroll">a</a>
|
||||
</li>
|
||||
<li class="keepcase"><a href="#instanceof" class="scroll">instanceof</a>
|
||||
<li class="keepcase"><a href="#instanceOf" class="scroll">instanceOf</a>
|
||||
</li>
|
||||
<li class="keepcase"><a href="#property" class="scroll">property</a>
|
||||
</li>
|
||||
|
|
@ -801,11 +801,11 @@ _gaq.push(['_trackPageview']);
|
|||
</pre>
|
||||
</div>
|
||||
</article>
|
||||
<article id="instanceof-section" class="codeblock">
|
||||
<article id="instanceOf-section" class="codeblock">
|
||||
<div class="header"><h1>.instanceof(constructor)</h1>
|
||||
</div>
|
||||
<div class="ctx">
|
||||
<h3>Assertion.prototype.instanceof()
|
||||
<h3>Assertion.prototype.instanceOf()
|
||||
</h3>
|
||||
</div>
|
||||
<div class="tags">
|
||||
|
|
@ -828,7 +828,7 @@ _gaq.push(['_trackPageview']);
|
|||
<div class="view-source">View Source
|
||||
</div>
|
||||
<div class="code-wrap">
|
||||
<pre class="source prettyprint"><code>Assertion.prototype.instanceof = function (constructor) {
|
||||
<pre class="source prettyprint"><code>Assertion.prototype.instanceOf = function (constructor) {
|
||||
var name = constructor.name;
|
||||
this.assert(
|
||||
this.obj instanceof constructor
|
||||
|
|
@ -1181,7 +1181,7 @@ _gaq.push(['_trackPageview']);
|
|||
<div class="header"><h1>.throw(constructor)</h1>
|
||||
</div>
|
||||
<div class="ctx">
|
||||
<h3>Assertion.prototype.throw()
|
||||
<h3>Assertion.prototype.Throw()
|
||||
</h3>
|
||||
</div>
|
||||
<div class="tags">
|
||||
|
|
@ -1214,7 +1214,7 @@ _gaq.push(['_trackPageview']);
|
|||
<div class="view-source">View Source
|
||||
</div>
|
||||
<div class="code-wrap">
|
||||
<pre class="source prettyprint"><code>Assertion.prototype.throw = function (constructor, msg) {
|
||||
<pre class="source prettyprint"><code>Assertion.prototype.Throw = function (constructor, msg) {
|
||||
new Assertion(this.obj).is.a('function');
|
||||
|
||||
var thrown = false;
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -407,15 +407,15 @@ module.exports = Context;
|
|||
function Context(){}
|
||||
|
||||
/**
|
||||
* Set the context `Test` to `test`.
|
||||
* Set the context `Runnable` to `runnable`.
|
||||
*
|
||||
* @param {Test} test
|
||||
* @param {Runnable} runnable
|
||||
* @return {Context}
|
||||
* @api private
|
||||
*/
|
||||
|
||||
Context.prototype.test = function(test){
|
||||
this._test = test;
|
||||
Context.prototype.runnable = function(runnable){
|
||||
this._runnable = runnable;
|
||||
return this;
|
||||
};
|
||||
|
||||
|
|
@ -428,12 +428,12 @@ Context.prototype.test = function(test){
|
|||
*/
|
||||
|
||||
Context.prototype.timeout = function(ms){
|
||||
this._test.timeout(ms);
|
||||
this._runnable.timeout(ms);
|
||||
return this;
|
||||
};
|
||||
|
||||
/**
|
||||
* Inspect the context void of `._test`.
|
||||
* Inspect the context void of `._runnable`.
|
||||
*
|
||||
* @return {String}
|
||||
* @api private
|
||||
|
|
@ -441,7 +441,7 @@ Context.prototype.timeout = function(ms){
|
|||
|
||||
Context.prototype.inspect = function(){
|
||||
return JSON.stringify(this, function(key, val){
|
||||
return '_test' == key
|
||||
return '_runnable' == key
|
||||
? undefined
|
||||
: val;
|
||||
}, 2);
|
||||
|
|
@ -854,11 +854,27 @@ require.register("mocha.js", function(module, exports, require){
|
|||
* MIT Licensed
|
||||
*/
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var path = require('browser/path');
|
||||
|
||||
/**
|
||||
* Expose `Mocha`.
|
||||
*/
|
||||
|
||||
exports = module.exports = Mocha;
|
||||
|
||||
/**
|
||||
* Library version.
|
||||
*/
|
||||
|
||||
exports.version = '0.14.0';
|
||||
exports.version = '1.0.1';
|
||||
|
||||
/**
|
||||
* Expose internals.
|
||||
*/
|
||||
|
||||
exports.utils = require('./utils');
|
||||
exports.interfaces = require('./interfaces');
|
||||
|
|
@ -870,6 +886,144 @@ exports.Suite = require('./suite');
|
|||
exports.Hook = require('./hook');
|
||||
exports.Test = require('./test');
|
||||
|
||||
/**
|
||||
* Return image `name` path.
|
||||
*
|
||||
* @param {String} name
|
||||
* @return {String}
|
||||
* @api private
|
||||
*/
|
||||
|
||||
function image(name) {
|
||||
return __dirname + '/../images/' + name + '.png';
|
||||
}
|
||||
|
||||
/**
|
||||
* Setup mocha with `options`.
|
||||
*
|
||||
* Options:
|
||||
*
|
||||
* - `ui` name "bdd", "tdd", "exports" etc
|
||||
* - `reporter` reporter instance, defaults to `mocha.reporters.Dot`
|
||||
* - `globals` array of accepted globals
|
||||
* - `timeout` timeout in milliseconds
|
||||
* - `ignoreLeaks` ignore global leaks
|
||||
*
|
||||
* @param {Object} options
|
||||
* @api public
|
||||
*/
|
||||
|
||||
function Mocha(options) {
|
||||
options = options || {};
|
||||
this.files = [];
|
||||
this.options = options;
|
||||
this.suite = new exports.Suite('', new exports.Context);
|
||||
this.ui(options.ui);
|
||||
this.reporter(options.reporter);
|
||||
if (options.timeout) this.suite.timeout(options.timeout);
|
||||
}
|
||||
|
||||
/**
|
||||
* Add test `file`.
|
||||
*
|
||||
* @param {String} file
|
||||
* @api public
|
||||
*/
|
||||
|
||||
Mocha.prototype.addFile = function(file){
|
||||
this.files.push(file);
|
||||
return this;
|
||||
};
|
||||
|
||||
/**
|
||||
* Set reporter to `name`, defaults to "dot".
|
||||
*
|
||||
* @param {String} name
|
||||
* @api public
|
||||
*/
|
||||
|
||||
Mocha.prototype.reporter = function(name){
|
||||
name = name || 'dot';
|
||||
this._reporter = require('./reporters/' + name);
|
||||
if (!this._reporter) throw new Error('invalid reporter "' + name + '"');
|
||||
return this;
|
||||
};
|
||||
|
||||
/**
|
||||
* Set test UI `name`, defaults to "bdd".
|
||||
*
|
||||
* @param {String} bdd
|
||||
* @api public
|
||||
*/
|
||||
|
||||
Mocha.prototype.ui = function(name){
|
||||
name = name || 'bdd';
|
||||
this._ui = exports.interfaces[name];
|
||||
if (!this._ui) throw new Error('invalid interface "' + name + '"');
|
||||
this._ui = this._ui(this.suite);
|
||||
return this;
|
||||
};
|
||||
|
||||
/**
|
||||
* Load registered files.
|
||||
*
|
||||
* @api private
|
||||
*/
|
||||
|
||||
Mocha.prototype.loadFiles = function(){
|
||||
var suite = this.suite;
|
||||
this.files.forEach(function(file){
|
||||
file = path.resolve(file);
|
||||
suite.emit('pre-require', global, file);
|
||||
suite.emit('require', require(file), file);
|
||||
suite.emit('post-require', global, file);
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* Enable growl support.
|
||||
*
|
||||
* @api private
|
||||
*/
|
||||
|
||||
Mocha.prototype.growl = function(runner, reporter) {
|
||||
var notify = require('growl');
|
||||
|
||||
runner.on('end', function(){
|
||||
var stats = reporter.stats;
|
||||
if (stats.failures) {
|
||||
var msg = stats.failures + ' of ' + runner.total + ' tests failed';
|
||||
notify(msg, { title: 'Failed', image: image('fail') });
|
||||
} else {
|
||||
notify(stats.passes + ' tests passed in ' + stats.duration + 'ms', {
|
||||
title: 'Passed'
|
||||
, image: image('pass')
|
||||
});
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* Run tests and invoke `fn()` when complete.
|
||||
*
|
||||
* @param {Function} fn
|
||||
* @return {Runner}
|
||||
* @api public
|
||||
*/
|
||||
|
||||
Mocha.prototype.run = function(fn){
|
||||
this.loadFiles();
|
||||
var suite = this.suite;
|
||||
var options = this.options;
|
||||
var runner = new exports.Runner(suite);
|
||||
var reporter = new this._reporter(runner);
|
||||
runner.ignoreLeaks = options.ignoreLeaks;
|
||||
if (options.grep) runner.grep(options.grep);
|
||||
if (options.globals) runner.globals(options.globals);
|
||||
if (options.growl) this.growl(runner, reporter);
|
||||
return runner.run(fn);
|
||||
};
|
||||
|
||||
}); // module: mocha.js
|
||||
|
||||
require.register("reporters/base.js", function(module, exports, require){
|
||||
|
|
@ -1047,7 +1201,7 @@ exports.list = function(failures){
|
|||
}
|
||||
|
||||
// indent stack trace without msg
|
||||
stack = stack.slice(index + 1)
|
||||
stack = stack.slice(index ? index + 1 : index)
|
||||
.replace(/^/gm, ' ');
|
||||
|
||||
console.error(fmt, (i + 1), test.fullTitle(), msg, stack);
|
||||
|
|
@ -1467,7 +1621,7 @@ function HTML(runner) {
|
|||
});
|
||||
|
||||
runner.on('fail', function(test, err){
|
||||
if (err.uncaught) runner.emit('test end', test);
|
||||
if ('hook' == test.type || err.uncaught) runner.emit('test end', test);
|
||||
});
|
||||
|
||||
runner.on('test end', function(test){
|
||||
|
|
@ -1488,12 +1642,22 @@ function HTML(runner) {
|
|||
var el = fragment('<div class="test pass pending"><h2>%e</h2></div>', test.title);
|
||||
} else {
|
||||
var el = fragment('<div class="test fail"><h2>%e</h2></div>', test.title);
|
||||
var str = test.err.stack || test.err;
|
||||
var str = test.err.stack || test.err.toString();
|
||||
|
||||
// FF / Opera do not add the message
|
||||
if (!~str.indexOf(test.err.message)) {
|
||||
str = test.err.message + '\n' + str;
|
||||
}
|
||||
|
||||
// <=IE7 stringifies to [Object Error]. Since it can be overloaded, we
|
||||
// check for the result of the stringifying.
|
||||
if ('[object Error]' == str) str = test.err.message;
|
||||
|
||||
// Safari doesn't give you a stack. Let's at least provide a source line.
|
||||
if (!test.err.stack && test.err.sourceURL && test.err.line !== undefined) {
|
||||
str += "\n(" + test.err.sourceURL + ":" + test.err.line + ")";
|
||||
}
|
||||
|
||||
el.appendChild(fragment('<pre class="error">%e</pre>', str));
|
||||
}
|
||||
|
||||
|
|
@ -1600,6 +1764,7 @@ exports.TAP = require('./tap');
|
|||
exports.JSON = require('./json');
|
||||
exports.HTML = require('./html');
|
||||
exports.List = require('./list');
|
||||
exports.Min = require('./min');
|
||||
exports.Spec = require('./spec');
|
||||
exports.Progress = require('./progress');
|
||||
exports.Landing = require('./landing');
|
||||
|
|
@ -1607,6 +1772,7 @@ exports.JSONCov = require('./json-cov');
|
|||
exports.HTMLCov = require('./html-cov');
|
||||
exports.JSONStream = require('./json-stream');
|
||||
exports.XUnit = require('./xunit')
|
||||
exports.Teamcity = require('./teamcity')
|
||||
|
||||
}); // module: reporters/index.js
|
||||
|
||||
|
|
@ -2072,6 +2238,162 @@ List.prototype.constructor = List;
|
|||
|
||||
}); // module: reporters/list.js
|
||||
|
||||
require.register("reporters/markdown.js", function(module, exports, require){
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var Base = require('./base')
|
||||
, utils = require('../utils');
|
||||
|
||||
/**
|
||||
* Expose `Markdown`.
|
||||
*/
|
||||
|
||||
exports = module.exports = Markdown;
|
||||
|
||||
/**
|
||||
* Initialize a new `Markdown` reporter.
|
||||
*
|
||||
* @param {Runner} runner
|
||||
* @api public
|
||||
*/
|
||||
|
||||
function Markdown(runner) {
|
||||
Base.call(this, runner);
|
||||
|
||||
var self = this
|
||||
, stats = this.stats
|
||||
, total = runner.total
|
||||
, level = 0
|
||||
, buf = '';
|
||||
|
||||
function title(str) {
|
||||
return Array(level).join('#') + ' ' + str;
|
||||
}
|
||||
|
||||
function indent() {
|
||||
return Array(level).join(' ');
|
||||
}
|
||||
|
||||
function mapTOC(suite, obj) {
|
||||
var ret = obj;
|
||||
obj = obj[suite.title] = obj[suite.title] || { suite: suite };
|
||||
suite.suites.forEach(function(suite){
|
||||
mapTOC(suite, obj);
|
||||
});
|
||||
return ret;
|
||||
}
|
||||
|
||||
function stringifyTOC(obj, level) {
|
||||
++level;
|
||||
var buf = '';
|
||||
var link;
|
||||
for (var key in obj) {
|
||||
if ('suite' == key) continue;
|
||||
if (key) link = ' - [' + key + '](#' + utils.slug(obj[key].suite.fullTitle()) + ')\n';
|
||||
if (key) buf += Array(level).join(' ') + link;
|
||||
buf += stringifyTOC(obj[key], level);
|
||||
}
|
||||
--level;
|
||||
return buf;
|
||||
}
|
||||
|
||||
function generateTOC(suite) {
|
||||
var obj = mapTOC(suite, {});
|
||||
return stringifyTOC(obj, 0);
|
||||
}
|
||||
|
||||
generateTOC(runner.suite);
|
||||
|
||||
runner.on('suite', function(suite){
|
||||
++level;
|
||||
var slug = utils.slug(suite.fullTitle());
|
||||
buf += '<a name="' + slug + '" />' + '\n';
|
||||
buf += title(suite.title) + '\n';
|
||||
});
|
||||
|
||||
runner.on('suite end', function(suite){
|
||||
--level;
|
||||
});
|
||||
|
||||
runner.on('pass', function(test){
|
||||
var code = clean(test.fn.toString());
|
||||
buf += test.title + '.\n';
|
||||
buf += '\n```js';
|
||||
buf += code + '\n';
|
||||
buf += '```\n\n';
|
||||
});
|
||||
|
||||
runner.on('end', function(){
|
||||
process.stdout.write('# TOC\n');
|
||||
process.stdout.write(generateTOC(runner.suite));
|
||||
process.stdout.write(buf);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Strip the function definition from `str`,
|
||||
* and re-indent for pre whitespace.
|
||||
*/
|
||||
|
||||
function clean(str) {
|
||||
str = str
|
||||
.replace(/^function *\(.*\) *{/, '')
|
||||
.replace(/\s+\}$/, '');
|
||||
|
||||
var spaces = str.match(/^\n?( *)/)[1].length
|
||||
, re = new RegExp('^ {' + spaces + '}', 'gm');
|
||||
|
||||
str = str.replace(re, '');
|
||||
|
||||
return str;
|
||||
}
|
||||
}); // module: reporters/markdown.js
|
||||
|
||||
require.register("reporters/min.js", function(module, exports, require){
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var Base = require('./base');
|
||||
|
||||
/**
|
||||
* Expose `Min`.
|
||||
*/
|
||||
|
||||
exports = module.exports = Min;
|
||||
|
||||
/**
|
||||
* Initialize a new `Min` minimal test reporter (best used with --watch).
|
||||
*
|
||||
* @param {Runner} runner
|
||||
* @api public
|
||||
*/
|
||||
|
||||
function Min(runner) {
|
||||
Base.call(this, runner);
|
||||
|
||||
runner.on('start', function(){
|
||||
// clear screen
|
||||
process.stdout.write('\033[2J');
|
||||
// set cursor position
|
||||
process.stdout.write('\033[1;3H');
|
||||
});
|
||||
|
||||
runner.on('end', this.epilogue.bind(this));
|
||||
}
|
||||
|
||||
/**
|
||||
* Inherit from `Base.prototype`.
|
||||
*/
|
||||
|
||||
Min.prototype = new Base;
|
||||
Min.prototype.constructor = Min;
|
||||
|
||||
}); // module: reporters/min.js
|
||||
|
||||
require.register("reporters/progress.js", function(module, exports, require){
|
||||
|
||||
/**
|
||||
|
|
@ -2601,6 +2923,8 @@ Runnable.prototype.run = function(fn){
|
|||
, finished
|
||||
, emitted;
|
||||
|
||||
if (ctx) ctx.runnable(this);
|
||||
|
||||
// timeout
|
||||
if (this.async) {
|
||||
if (ms) {
|
||||
|
|
@ -2818,7 +3142,6 @@ Runner.prototype.hook = function(name, fn){
|
|||
var hook = hooks[i];
|
||||
if (!hook) return fn();
|
||||
self.currentRunnable = hook;
|
||||
hook.ctx.test(self.test);
|
||||
|
||||
self.emit('hook', hook);
|
||||
|
||||
|
|
@ -2927,7 +3250,6 @@ Runner.prototype.runTest = function(fn){
|
|||
, self = this;
|
||||
|
||||
try {
|
||||
test.ctx.test(test);
|
||||
test.on('error', function(err){
|
||||
self.fail(test, err);
|
||||
});
|
||||
|
|
@ -3579,8 +3901,21 @@ exports.files = function(dir, ret){
|
|||
|
||||
return ret;
|
||||
};
|
||||
}); // module: utils.js
|
||||
|
||||
/**
|
||||
* Compute a slug from the given `str`.
|
||||
*
|
||||
* @param {String} str
|
||||
* @return {String}
|
||||
*/
|
||||
|
||||
exports.slug = function(str){
|
||||
return str
|
||||
.toLowerCase()
|
||||
.replace(/ +/g, '-')
|
||||
.replace(/[^-\w]/g, '');
|
||||
};
|
||||
}); // module: utils.js
|
||||
/**
|
||||
* Node shims.
|
||||
*
|
||||
|
|
@ -3652,6 +3987,7 @@ window.mocha = require('mocha');
|
|||
;(function(){
|
||||
var suite = new mocha.Suite('', new mocha.Context)
|
||||
, utils = mocha.utils
|
||||
, options = {}
|
||||
|
||||
/**
|
||||
* Highlight the given string of `js`.
|
||||
|
|
@ -3696,12 +4032,16 @@ window.mocha = require('mocha');
|
|||
}
|
||||
|
||||
/**
|
||||
* Setup mocha with the give `ui` name.
|
||||
* Setup mocha with the given setting options.
|
||||
*/
|
||||
|
||||
mocha.setup = function(ui){
|
||||
ui = mocha.interfaces[ui];
|
||||
mocha.setup = function(opts){
|
||||
if ('string' === typeof opts) options.ui = opts;
|
||||
else options = opts;
|
||||
|
||||
ui = mocha.interfaces[options.ui];
|
||||
if (!ui) throw new Error('invalid mocha interface "' + ui + '"');
|
||||
if (options.timeout) suite.timeout(options.timeout);
|
||||
ui(suite);
|
||||
suite.emit('pre-require', window);
|
||||
};
|
||||
|
|
@ -3710,15 +4050,18 @@ window.mocha = require('mocha');
|
|||
* Run mocha, returning the Runner.
|
||||
*/
|
||||
|
||||
mocha.run = function(Reporter){
|
||||
mocha.run = function(fn){
|
||||
suite.emit('run');
|
||||
var runner = new mocha.Runner(suite);
|
||||
Reporter = Reporter || mocha.reporters.HTML;
|
||||
var Reporter = options.reporter || mocha.reporters.HTML;
|
||||
var reporter = new Reporter(runner);
|
||||
var query = parse(window.location.search || "");
|
||||
if (query.grep) runner.grep(new RegExp(query.grep));
|
||||
if (options.ignoreLeaks) runner.ignoreLeaks = true;
|
||||
if (options.globals) runner.globals(options.globals);
|
||||
runner.globals(['location']);
|
||||
runner.on('end', highlightCode);
|
||||
return runner.run();
|
||||
return runner.run(fn);
|
||||
};
|
||||
})();
|
||||
})();
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
var used = [];
|
||||
var exports = module.exports = {};
|
||||
|
||||
exports.version = '0.5.2';
|
||||
exports.version = '0.5.3';
|
||||
|
||||
exports.Assertion = require('./assertion');
|
||||
exports.AssertionError = require('./error');
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
"name": "chai",
|
||||
"description": "BDD/TDD assertion library for node.js and the browser. Test framework agnostic.",
|
||||
"keywords": [ "test", "assertion", "assert", "testing" ],
|
||||
"version": "0.5.2",
|
||||
"version": "0.5.3",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/logicalparadox/chai"
|
||||
|
|
|
|||
Loading…
Reference in a new issue