Skip to content

Commit

Permalink
Merge pull request #5 from mdamien/basic-fixes
Browse files Browse the repository at this point in the history
Basic improvements
  • Loading branch information
Yuffster committed Jun 14, 2016
2 parents 80251fb + 4854ec8 commit 3348ca9
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules/
2 changes: 1 addition & 1 deletion describe.js
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
try {
fun.call({
expect: function(a,b) {
return expect(a,b,respond,{});
return expect(a, b, respond, options);
},
expectError: function(a,b) {
options.getError = true;
Expand Down
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,8 @@
"url": "http://msteigerwalt.com"
},
"homepage": "http://github.com/yuffster/describe",
"main": "describe.js"
"main": "describe.js",
"scripts": {
"test": "node tests/run_tests.js"
}
}
2 changes: 1 addition & 1 deletion tests/tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ describe('error expectations, Promises', {
},

"wrong error string returned (this should fail)": function() {
this.expectError(failedPromiseString(), "expected error");
this.expectError(failedPromiseString(), "out of cheese");
},


Expand Down

0 comments on commit 3348ca9

Please sign in to comment.