diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-07-04 01:31:30 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-07-04 01:31:30 +0800 |
| commit | 3290421e2f16bd0ea1b13ba3f3d93fc4d233c750 (patch) | |
| tree | dfbcfb70609fd24074dad6686f447a452313c6c6 /test/unit/app/nodeify-test.js | |
| parent | 85fd75c21f0e64817b3d4c4d51f37649e3a81233 (diff) | |
| parent | 1f0cf11af1c94e750bbc4c5238c3ee028350a6c6 (diff) | |
| download | tangerine-wallet-browser-3290421e2f16bd0ea1b13ba3f3d93fc4d233c750.tar tangerine-wallet-browser-3290421e2f16bd0ea1b13ba3f3d93fc4d233c750.tar.gz tangerine-wallet-browser-3290421e2f16bd0ea1b13ba3f3d93fc4d233c750.tar.bz2 tangerine-wallet-browser-3290421e2f16bd0ea1b13ba3f3d93fc4d233c750.tar.lz tangerine-wallet-browser-3290421e2f16bd0ea1b13ba3f3d93fc4d233c750.tar.xz tangerine-wallet-browser-3290421e2f16bd0ea1b13ba3f3d93fc4d233c750.tar.zst tangerine-wallet-browser-3290421e2f16bd0ea1b13ba3f3d93fc4d233c750.zip | |
fix merge conflicts
Diffstat (limited to 'test/unit/app/nodeify-test.js')
| -rw-r--r-- | test/unit/app/nodeify-test.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/test/unit/app/nodeify-test.js b/test/unit/app/nodeify-test.js index 901603c8b..938b76c68 100644 --- a/test/unit/app/nodeify-test.js +++ b/test/unit/app/nodeify-test.js @@ -13,8 +13,12 @@ describe('nodeify', function () { it('should retain original context', function (done) { var nodified = nodeify(obj.promiseFunc, obj) nodified('baz', function (err, res) { - assert.equal(res, 'barbaz') - done() + if (!err) { + assert.equal(res, 'barbaz') + done() + } else { + done(new Error(err.toString())) + } }) }) |