Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

Commit 9175f60

Browse files
committed
Apply feedback
1 parent a78a46e commit 9175f60

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

q.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1645,7 +1645,7 @@ function any(promises) {
16451645
function onRejected(err) {
16461646
pendingCount--;
16471647
if (pendingCount === 0) {
1648-
var rejection = err || new Error("Rejection value was: " + err);
1648+
var rejection = err || new Error("" + err);
16491649

16501650
rejection.message = ("Q can't get fulfillment value from any promise, all " +
16511651
"promises were rejected. Last error message: " + rejection.message);

spec/q-spec.js

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,7 +1192,7 @@ describe("any", function() {
11921192
var deferreds = [Q.defer(), Q.defer()];
11931193
var promises = [deferreds[0].promise, deferreds[1].promise];
11941194

1195-
return testReject(promises, deferreds, new Error('Rejected'));
1195+
return testReject(promises, deferreds, new Error("Rejected"));
11961196
});
11971197

11981198
it("rejects after all promises in a sparse array are rejected", function() {
@@ -1223,15 +1223,10 @@ describe("any", function() {
12231223
var promise = Q.any(promises);
12241224
var expectedError;
12251225

1226-
switch (rejectionValue) {
1227-
case null:
1228-
expectedError = new Error("Rejection value was: null");
1229-
break;
1230-
case undefined:
1231-
expectedError = new Error("Rejection value was: undefined");
1232-
break;
1233-
default:
1234-
expectedError = new Error(rejectionValue.message);
1226+
if (rejectionValue) {
1227+
expectedError = new Error(rejectionValue.message);
1228+
} else {
1229+
expectedError = new Error("" + rejectionValue);
12351230
}
12361231

12371232
for (var index = 0; index < deferreds.length; index++) {

0 commit comments

Comments
 (0)