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

Add progress to Q.all #782

Open
wants to merge 7 commits into
base: v1
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions q.js
Original file line number Diff line number Diff line change
Expand Up @@ -1596,13 +1596,13 @@ function all(promises) {
function (value) {
promises[index] = value;
if (--pendingCount === 0) {
deferred.notify({ resolved: promises.length, pending: 0, total: promises.length });
deferred.resolve(promises);
} else {
deferred.notify({ resolved: promises.length-pendingCount, pending: pendingCount, total: promises.length });
}
},
deferred.reject,
function (progress) {
deferred.notify({ index: index, value: progress });
}
deferred.reject
);
}
}, void 0);
Expand Down
15 changes: 7 additions & 8 deletions spec/q-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -1151,27 +1151,26 @@ describe("all", function () {
it("sends { index, value } progress updates", function () {
var deferred1 = Q.defer();
var deferred2 = Q.defer();
var deferred3 = Q.defer();

var progressValues = [];

Q.delay(50).then(function () {
deferred1.notify("a");
deferred1.resolve();
});
Q.delay(100).then(function () {
deferred2.notify("b");
deferred2.resolve();
});
Q.delay(150).then(function () {
deferred1.notify("c");
deferred1.resolve();
deferred3.resolve();
});

return Q.all([deferred1.promise, deferred2.promise]).then(
return Q.all([deferred1.promise, deferred2.promise, deferred3.promise]).then(
function () {
expect(progressValues).toEqual([
{ index: 0, value: "a" },
{ index: 1, value: "b" },
{ index: 0, value: "c" }
{ resolved: 1, pending: 2, total: 3 },
{ resolved: 2, pending: 1, total: 3 },
{ resolved: 3, pending: 0, total: 3 }
]);
},
undefined,
Expand Down