Skip to content

Commit

Permalink
Merge branch 'feature/child'
Browse files Browse the repository at this point in the history
* feature/child:
  Update unexpected to 10.27.0, update unexpected-messy to 7.0.0 and drop it as a peer dep.
  Revert me: Update to unexpectedjs/unexpected-messy#ee9720dd98d30ca59f72ec93cd25bb5355ec654f
  Use expect.child and expect.exportAssertion.
  Revert me: Update to unexpectedjs/unexpected#d10718ac1a1e3dc90f3dadacafd391132e4ebc94
  • Loading branch information
papandreou committed Apr 17, 2017
2 parents c12f05b + 2ddb330 commit 835f0cb
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
4 changes: 3 additions & 1 deletion lib/unexpectedExpress.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ module.exports = {
name: 'unexpected-express',
version: require('../package.json').version,
installInto: function (expect) {
expect = expect.child();

var topLevelExpect = expect;

expect.use(require('unexpected-messy'));
Expand All @@ -40,7 +42,7 @@ module.exports = {
}
});

expect.addAssertion([
expect.exportAssertion([
'<function> to yield exchange satisfying <any>', // Please prefer this one because it does use 'to satisfy' semantics
'<function> to yield exchange <any>'
], function (expect, subject, value) {
Expand Down
7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@
"homepage": "https://github.com/unexpectedjs/unexpected-express",
"peerDependencies": {
"express": "*",
"unexpected": "^10.0.0",
"unexpected-messy": "^6.0.0"
"unexpected": "^10.27.0"
},
"devDependencies": {
"body-parser": "1.0.2",
Expand All @@ -47,7 +46,7 @@
"mocha": "2.3.3",
"mock-fs": "4.0.0",
"sinon": "1.17.3",
"unexpected": "10.26.0",
"unexpected": "10.27.0",
"unexpected-documentation-site-generator": "^4.2.3",
"unexpected-markdown": "1.7.1",
"unexpected-stream": "2.0.4"
Expand All @@ -58,6 +57,6 @@
"is-stream": "^1.1.0",
"messy": "^6.6.1",
"underscore": "1.6.0",
"unexpected-messy": "^6.0.0"
"unexpected-messy": "7.0.0"
}
}

0 comments on commit 835f0cb

Please sign in to comment.