Permalink
Browse files

Add lint to tests, fix tests

1 parent 3ee2701 commit 26ae6a2406626bb97ac7880bc770878dbfc9aefa @kriskowal committed Sep 30, 2015
Showing with 5 additions and 5 deletions.
  1. +1 −1 .travis.yml
  2. +1 −1 package.json
  3. +3 −3 spec/q-spec.js
View
@@ -2,4 +2,4 @@ language: node_js
node_js:
- "0.10"
script:
- npm run lint && npm test
+ npm test
View
@@ -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",
View
@@ -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);
}
@@ -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;
}
@@ -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;
}

0 comments on commit 26ae6a2

Please sign in to comment.