Skip to content

Fix animationSettled hanging forever #492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
spruce wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix animationSettled hanging forever #492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9549d73
Fix animationSettled hanging forever
spruce Jul 16, 2022
91139ec
Fix assert amount in test
spruce Jul 16, 2022
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
1 change: 1 addition & 0 deletions addon/src/-private/scheduler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ class MicroRoutine {
}
stop() {
this.stopped = true;
this.resolve({ stopped: true });
if (this.state && isPromise(this.state.value)) {
fireCancellation(this.state.value);
}
Expand Down
9 changes: 6 additions & 3 deletions test-app/tests/unit/scheduler-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ module('Unit | scheduler', function (hooks) {
});

test('promise returned from spawn does not resolve if an inner promise resolves after stop', function (assert) {
assert.expect(1);
assert.expect(2);

return spawn(function* () {
spawn(function* () {
Expand All @@ -284,8 +284,11 @@ module('Unit | scheduler', function (hooks) {
});
stop(task);
resolve();
yield task;
assert.ok(false, 'should never get here');
let yielded = yield task;
assert.ok(
yielded.stopped,
'After stopping a Microtask it should yield `{ stopped: true }`.',
);
});
yield microwait();
assert.ok(true, 'got to end');
Expand Down