Skip to content

Commit

Permalink
Add lint to tests, fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
kriskowal committed Sep 30, 2015
1 parent 3ee2701 commit 26ae6a2
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ language: node_js
node_js:
- "0.10"
script:
npm run lint && npm test
npm test
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"promises-aplus-tests": "1.x"
},
"scripts": {
"test": "jasmine-node spec && promises-aplus-tests spec/aplus-adapter",
"test": "npm ls -s && jasmine-node spec && promises-aplus-tests spec/aplus-adapter && npm run -s lint",
"test-browser": "opener spec/q-spec.html",
"benchmark": "matcha",
"lint": "jshint q.js",
Expand Down
6 changes: 3 additions & 3 deletions spec/q-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -1218,7 +1218,7 @@ describe("any", function() {
.then(function() {
expect(promise.isRejected()).toBe(true);
expect(promise.inspect().reason.message)
.toBe("Can't get fulfillment value from any promise, all promises were rejected.");
.toBe("Q can't get fulfillment value from any promise, all promises were rejected.");
})
.timeout(1000);
}
Expand Down Expand Up @@ -1680,7 +1680,7 @@ describe("fin", function () {
try {
Q().fin(foo.bar);
} catch (err) {
expect(err.message).toBe("Can't apply finally callback");
expect(err.message).toBe("Q can't apply finally callback");
threw = true;
}

Expand All @@ -1695,7 +1695,7 @@ describe("fin", function () {
try {
Q().fin(123);
} catch (err) {
expect(err.message).toBe("Can't apply finally callback");
expect(err.message).toBe("Q can't apply finally callback");
threw = true;
}

Expand Down

0 comments on commit 26ae6a2

Please sign in to comment.