Skip to content

Commit

Permalink
Revert all changes for #2026
Browse files Browse the repository at this point in the history
Revert "Added skip reason for issue #2026"

This reverts commit bd784b3.
  • Loading branch information
rdennis committed May 19, 2018
1 parent aa711ce commit 983715e
Show file tree
Hide file tree
Showing 37 changed files with 1,627 additions and 6,008 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ yarn.lock
*_REMOTE_*
docs/_site
docs/_dist
docs/api
.vscode/

36 changes: 0 additions & 36 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,39 +1,3 @@
# 5.1.0 / 2018-04-12

## :tada: Enhancements

- [#3210]: Add `--exclude` option ([@metalex9])

## :bug: Fixes

- [#3318]: Fix failures in circular objects in JSON reporter ([@jeversmann], [@boneskull])

## :book: Documentation

- [#3323]: Publish actual [API documentation](https://mochajs.org/api/)! ([@dfberry], [@Munter])
- [#3299]: Improve docs around exclusive tests ([@nicgirault])

## :nut_and_bolt: Other

- [#3302], [#3308], [#3310], [#3315], [#3316]: Build matrix improvements ([more info](https://boneskull.com/mocha-and-travis-ci-build-stages/)) ([@outsideris], [@boneskull])
- [#3272]: Refactor reporter tests ([@jMuzsik])

[#3210]: https://github.com/mochajs/mocha/pull/3210
[#3318]: https://github.com/mochajs/mocha/pull/3318
[#3323]: https://github.com/mochajs/mocha/pull/3323
[#3299]: https://github.com/mochajs/mocha/pull/3299
[#3302]: https://github.com/mochajs/mocha/pull/3302
[#3308]: https://github.com/mochajs/mocha/pull/3308
[#3310]: https://github.com/mochajs/mocha/pull/3310
[#3315]: https://github.com/mochajs/mocha/pull/3315
[#3316]: https://github.com/mochajs/mocha/pull/3316
[#3272]: https://github.com/mochajs/mocha/pull/3272
[@metalex9]: https://github.com/metalex9
[@jeversmann]: https://github.com/jeversmann
[@dfberry]: https://github.com/dfberry
[@nicgirault]: https://github.com/nicgirault
[@jMuzsik]: https://github.com/jMuzsik

# 5.0.5 / 2018-03-22

Welcome [@outsideris] to the team!
Expand Down
3 changes: 1 addition & 2 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ Mocha is a feature-rich JavaScript test framework running on [Node.js](https://n

- [Installation](#installation)
- [Getting Started](#getting-started)
- [Detects Multiple Calls to `done()`](#detects-multiple-calls-to-done)
- [Assertions](#assertions)
- [Asynchronous Code](#asynchronous-code)
- [Synchronous Code](#synchronous-code)
Expand Down Expand Up @@ -1344,4 +1343,4 @@ $ REPORTER=nyan npm test

## More Information

In addition to chatting with us on [Gitter](https://gitter.im/mochajs/mocha), for additional information such as using spies, mocking, and shared behaviours be sure to check out the [Mocha Wiki](https://github.com/mochajs/mocha/wiki) on GitHub. For discussions join the [Google Group](https://groups.google.com/group/mochajs). For a running example of Mocha, view [example/tests.html](example/tests.html). For the JavaScript API, view the [API documentation](api/) or the [source](https://github.com/mochajs/mocha/blob/master/lib/mocha.js#L51).
In addition to chatting with us on [Gitter](https://gitter.im/mochajs/mocha), for additional information such as using spies, mocking, and shared behaviours be sure to check out the [Mocha Wiki](https://github.com/mochajs/mocha/wiki) on GitHub. For discussions join the [Google Group](https://groups.google.com/group/mochajs). For a running example of Mocha, view [example/tests.html](example/tests.html). For the JavaScript API, view the [source](https://github.com/mochajs/mocha/blob/master/lib/mocha.js#L51).
6 changes: 2 additions & 4 deletions lib/context.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
'use strict';
/**
* @module Context
*/

/**
* Expose `Context`.
*/
Expand All @@ -20,7 +18,7 @@ function Context () {}
*
* @api private
* @param {Runnable} runnable
* @return {Context} context
* @return {Context}
*/
Context.prototype.runnable = function (runnable) {
if (!arguments.length) {
Expand Down
13 changes: 2 additions & 11 deletions lib/hook.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
'use strict';
/**
* @module Hook
*
*/

/**
* Module dependencies.
*/
Expand All @@ -17,12 +14,8 @@ var inherits = require('./utils').inherits;
module.exports = Hook;

/**
* Initialize a new `Hook` with the given `title` and callback `fn`. Derived from
* `Runnable`.
* Initialize a new `Hook` with the given `title` and callback `fn`.
*
* @memberof Mocha
* @public
* @class
* @param {String} title
* @param {Function} fn
* @api private
Expand All @@ -40,8 +33,6 @@ inherits(Hook, Runnable);
/**
* Get or set the test `err`.
*
* @memberof Mocha.Hook
* @public
* @param {Error} err
* @return {Error}
* @api public
Expand Down
15 changes: 4 additions & 11 deletions lib/interfaces/bdd.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,16 +78,12 @@ module.exports = function (suite) {
* acting as a thunk.
*/

context.it = context.specify = function (title, fn, reason) {
context.it = context.specify = function (title, fn) {
var suite = suites[0];
if (suite.isPending()) {
fn = null;
}
if (typeof fn === 'string') {
reason = fn;
fn = null;
}
var test = new Test(title, fn, reason);
var test = new Test(title, fn);
test.file = file;
suite.addTest(test);
return test;
Expand All @@ -105,11 +101,8 @@ module.exports = function (suite) {
* Pending test case.
*/

context.xit = context.xspecify = context.it.skip = function (title, fn, reason) {
if (typeof fn === 'string') {
reason = fn;
}
return context.it(title, null, reason);
context.xit = context.xspecify = context.it.skip = function (title) {
return context.it(title);
};

/**
Expand Down
45 changes: 2 additions & 43 deletions lib/mocha.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@
* Copyright(c) 2011 TJ Holowaychuk <tj@vision-media.ca>
* MIT Licensed
*/
/**
* @namespace Mocha
* @module Mocha
*/

/**
* Module dependencies.
*/
Expand Down Expand Up @@ -37,25 +34,11 @@ if (!process.browser) {
* Expose internals.
*/

/**
* @public
* @class utils
* @memberof Mocha
*/
exports.utils = utils;
exports.interfaces = require('./interfaces');
/**
*
* @memberof Mocha
* @public
*/
exports.reporters = reporters;
exports.Runnable = require('./runnable');
exports.Context = require('./context');
/**
*
* @memberof Mocha
*/
exports.Runner = require('./runner');
exports.Suite = require('./suite');
exports.Hook = require('./hook');
Expand Down Expand Up @@ -88,8 +71,6 @@ function image (name) {
* - `fullTrace` display the full stack-trace on failing
* - `grep` string or regexp to filter tests with
*
* @public
* @class Mocha
* @param {Object} options
* @api public
*/
Expand Down Expand Up @@ -125,7 +106,6 @@ function Mocha (options) {
/**
* Enable or disable bailing on the first failure.
*
* @public
* @api public
* @param {boolean} [bail]
*/
Expand All @@ -140,7 +120,6 @@ Mocha.prototype.bail = function (bail) {
/**
* Add test `file`.
*
* @public
* @api public
* @param {string} file
*/
Expand All @@ -152,7 +131,6 @@ Mocha.prototype.addFile = function (file) {
/**
* Set reporter to `reporter`, defaults to "spec".
*
* @public
* @param {String|Function} reporter name or constructor
* @param {Object} reporterOptions optional options
* @api public
Expand Down Expand Up @@ -203,7 +181,7 @@ Mocha.prototype.reporter = function (reporter, reporterOptions) {

/**
* Set test UI `name`, defaults to "bdd".
* @public
*
* @api public
* @param {string} bdd
*/
Expand Down Expand Up @@ -282,7 +260,6 @@ Mocha.prototype._growl = function (runner, reporter) {
/**
* Escape string and add it to grep as a regexp.
*
* @public
* @api public
* @param str
* @returns {Mocha}
Expand All @@ -294,7 +271,6 @@ Mocha.prototype.fgrep = function (str) {
/**
* Add regexp to grep, if `re` is a string it is escaped.
*
* @public
* @param {RegExp|String} re
* @return {Mocha}
* @api public
Expand All @@ -314,7 +290,6 @@ Mocha.prototype.grep = function (re) {
/**
* Invert `.grep()` matches.
*
* @public
* @return {Mocha}
* @api public
*/
Expand All @@ -326,7 +301,6 @@ Mocha.prototype.invert = function () {
/**
* Ignore global leaks.
*
* @public
* @param {Boolean} ignore
* @return {Mocha}
* @api public
Expand All @@ -343,7 +317,6 @@ Mocha.prototype.ignoreLeaks = function (ignore) {
*
* @return {Mocha}
* @api public
* @public
*/
Mocha.prototype.checkLeaks = function () {
this.options.ignoreLeaks = false;
Expand All @@ -355,7 +328,6 @@ Mocha.prototype.checkLeaks = function () {
*
* @return {Mocha}
* @api public
* @public
*/
Mocha.prototype.fullTrace = function () {
this.options.fullStackTrace = true;
Expand All @@ -367,7 +339,6 @@ Mocha.prototype.fullTrace = function () {
*
* @return {Mocha}
* @api public
* @public
*/
Mocha.prototype.growl = function () {
this.options.growl = true;
Expand All @@ -380,7 +351,6 @@ Mocha.prototype.growl = function () {
* @param {Array|String} globals
* @return {Mocha}
* @api public
* @public
* @param {Array|string} globals
* @return {Mocha}
*/
Expand All @@ -395,7 +365,6 @@ Mocha.prototype.globals = function (globals) {
* @param {Boolean} colors
* @return {Mocha}
* @api public
* @public
* @param {boolean} colors
* @return {Mocha}
*/
Expand All @@ -412,7 +381,6 @@ Mocha.prototype.useColors = function (colors) {
* @param {Boolean} inlineDiffs
* @return {Mocha}
* @api public
* @public
* @param {boolean} inlineDiffs
* @return {Mocha}
*/
Expand All @@ -427,7 +395,6 @@ Mocha.prototype.useInlineDiffs = function (inlineDiffs) {
* @param {Boolean} hideDiff
* @return {Mocha}
* @api public
* @public
* @param {boolean} hideDiff
* @return {Mocha}
*/
Expand All @@ -442,7 +409,6 @@ Mocha.prototype.hideDiff = function (hideDiff) {
* @param {Number} timeout
* @return {Mocha}
* @api public
* @public
* @param {number} timeout
* @return {Mocha}
*/
Expand All @@ -457,7 +423,6 @@ Mocha.prototype.timeout = function (timeout) {
* @param {Number} retry times
* @return {Mocha}
* @api public
* @public
*/
Mocha.prototype.retries = function (n) {
this.suite.retries(n);
Expand All @@ -470,7 +435,6 @@ Mocha.prototype.retries = function (n) {
* @param {Number} slow
* @return {Mocha}
* @api public
* @public
* @param {number} slow
* @return {Mocha}
*/
Expand All @@ -485,7 +449,6 @@ Mocha.prototype.slow = function (slow) {
* @param {Boolean} enabled
* @return {Mocha}
* @api public
* @public
* @param {boolean} enabled
* @return {Mocha}
*/
Expand All @@ -499,7 +462,6 @@ Mocha.prototype.enableTimeouts = function (enabled) {
*
* @return {Mocha}
* @api public
* @public
*/
Mocha.prototype.asyncOnly = function () {
this.options.asyncOnly = true;
Expand All @@ -510,7 +472,6 @@ Mocha.prototype.asyncOnly = function () {
* Disable syntax highlighting (in browser).
*
* @api public
* @public
*/
Mocha.prototype.noHighlighting = function () {
this.options.noHighlighting = true;
Expand All @@ -522,7 +483,6 @@ Mocha.prototype.noHighlighting = function () {
*
* @return {Mocha}
* @api public
* @public
*/
Mocha.prototype.allowUncaught = function () {
this.options.allowUncaught = true;
Expand Down Expand Up @@ -568,7 +528,6 @@ Mocha.prototype.forbidPending = function () {
* cache first in whichever manner best suits your needs.
*
* @api public
* @public
* @param {Function} fn
* @return {Runner}
*/
Expand Down
6 changes: 1 addition & 5 deletions lib/ms.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
'use strict';
/**
* @module milliseconds
*/

/**
* Helpers.
*/
Expand All @@ -15,8 +13,6 @@ var y = d * 365.25;
/**
* Parse or format the given `val`.
*
* @memberof Mocha
* @public
* @api public
* @param {string|number} val
* @return {string|number}
Expand Down

0 comments on commit 983715e

Please sign in to comment.