Skip to content

Commit

Permalink
Include chai-as-promised; update packages
Browse files Browse the repository at this point in the history
  • Loading branch information
epsitec committed Jan 6, 2017
1 parent 094dc0c commit 4cc7f9f
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 14 deletions.
8 changes: 3 additions & 5 deletions .jscsrc
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,12 @@

"validateIndentation": 2,
"validateParameterSeparator": ", ",
"validateQuoteMarks": "'",
"validateQuoteMarks": { "mark": "'", "escape": false, "ignoreJSX": true },

"maximumLineLength": {
"value": 120,
"allowUrlComments": true,
"allowRegex": true
"value": 200,
"allExcept": ["comments", "functionSignature", "regex", "require", "urlComments"]
},

"esnext": true,
"requireSemicolons": true
}
5 changes: 2 additions & 3 deletions .jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"camelcase" : true,
"curly" : true,
"eqeqeq" : true,
"es3" : false,
"esversion" : 6,
"forin" : true,
"freeze" : true,
"immed" : true,
Expand All @@ -32,7 +32,6 @@
"boss" : false,
"debug" : false,
"eqnull" : false,
"esnext" : true,
"evil" : false,
"expr" : false,
"funcscope" : false,
Expand Down Expand Up @@ -63,7 +62,7 @@
"jquery" : false,
"mocha" : true,
"mootools" : false,
"node" : false,
"node" : true,
"nonstandard" : false,
"phantom" : false,
"prototypejs" : false,
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ The [chai](http://chaijs.com) testing framework works hand in hand with
[mocha](https://mochajs.org/). It is configured by default with following
plugins:

* [chai-as-promised](https://github.com/domenic/chai-as-promised) → adds
support for asserting promises and async code.
* [chai-equal-jsx](https://github.com/echenley/chai-equal-jsx) → adds
`equalJSX` and `includeJSX` assetions.
* [chai-spies](http://chaijs.com/plugins/chai-spies) → adds spy ability.
Expand All @@ -18,7 +20,7 @@ the `./test` folder of the including project:
`./test/test-helper.js` file in every test.
* `test-helper.js` → configures the global `document`, `window` and
`navigator` objects.

And for Wallaby.js users, `mai-chai` comes with a default configuration
file.

Expand Down
11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mai-chai",
"version": "2.6.0",
"version": "3.0.0",
"description": "The chai testing framework paired with mocha. It is configured by default with chai-spies, chai-string and dirty-chai.",
"main": "src/index.js",
"scripts": {
Expand All @@ -18,16 +18,17 @@
},
"homepage": "https://github.com/epsitec-sa/mai-chai#readme",
"devDependencies": {
"generic-js-env": "^1.3.2"
"generic-js-env": "^1.6.1"
},
"peerDependencies": {},
"dependencies": {
"chai": "^3.5.0",
"chai-as-promised": "^6.0.0",
"chai-equal-jsx": "^1.0.9",
"chai-spies": "^0.7.1",
"chai-string": "^1.2.0",
"chai-string": "^1.3.0",
"dirty-chai": "^1.2.2",
"jsdom": "^8.1.0",
"mocha": "^2.4.5"
"jsdom": "^9.9.1",
"mocha": "^3.2.0"
}
}
2 changes: 2 additions & 0 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
var chai = require ('chai');
var chaiSpies = require ('chai-spies');
var chaiString = require ('chai-string');
var chaiAsPromised = require ('chai-as-promised');
var dirtyChai = require ('dirty-chai');
var chaiEqualJSX = require ('chai-equal-jsx');

chai.use (chaiEqualJSX);
chai.use (chaiString);
chai.use (chaiAsPromised);
chai.use (chaiSpies);
chai.use (dirtyChai);

Expand Down

0 comments on commit 4cc7f9f

Please sign in to comment.