Skip to content
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

Jump to bottom

Fix Failing Tests resulting from ember-concurrency v2 bump #306

Merged
merged 1 commit into from
Aug 16, 2021
Merged

Fix Failing Tests resulting from ember-concurrency v2 bump #306

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
116 changes: 92 additions & 24 deletions tests/unit/wait-for-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,20 +234,56 @@ if (DEBUG) {

class NativeThing {
iterations: Array<Number> = [];
continue: Function = () => null;
_continue?: Function;

@taskDec
@waitFor
*doStuffTask(): TaskGenerator<string> {
for (let i = 0; i < 3; i += 1) {
let deferred = new Deferred();
this.continue = deferred.resolve;
yield deferred.promise;
let continuation = new Deferred();
if (this._continue !== undefined) {
throw new Error('pending continue, cannot proceed');
}
let completion = new Deferred();
let complete = false;

this._continue = () => {
if (complete === true) {
throw new Error('Cannot call continue twice on a single iteration');
} else {
complete = true;
}

continuation.resolve();
return completion.promise;
};

try {
yield continuation.promise;
} finally {
this._continue = undefined;
completion.resolve();
}
this.iterations.push(i);
}
return 'done';
}

get continue() {
if (this._continue === undefined) {
throw new Error('Cannot call continue twice on a single iteration');
} else {
try {
return this._continue;
} finally {
// detect invalid usage. Specifically, our test (as written
// currently) would be in-error if any given continue() is invoked more
// then once
this._continue = undefined;
}
}
}

@taskDec
*parentTask(): TaskGenerator<string> {
// @ts-ignore
Expand All @@ -264,22 +300,21 @@ if (DEBUG) {

test('tasks with multiple yields work', async function (assert) {
let thing = new NativeThing();
let task = perform(get(thing, 'doStuffTask'));

let promise = perform(get(thing, 'doStuffTask'));
assert.deepEqual(getPendingWaiterState().pending, 1);

thing.continue();
await Promise.resolve();
await thing.continue();
assert.deepEqual(thing.iterations, [0]);
assert.deepEqual(getPendingWaiterState().pending, 1);

thing.continue();
await Promise.resolve();
await thing.continue();
assert.deepEqual(thing.iterations, [0, 1]);
assert.deepEqual(getPendingWaiterState().pending, 1);

thing.continue();
await promise;
await thing.continue();
await task;

assert.deepEqual(thing.iterations, [0, 1, 2]);
assert.deepEqual(getPendingWaiterState().pending, 0);
});
Expand All @@ -302,8 +337,7 @@ if (DEBUG) {
let instance = perform(get(thing, taskName));
assert.deepEqual(getPendingWaiterState().pending, 1);

thing.continue();
await Promise.resolve();
await thing.continue();
assert.deepEqual(thing.iterations, [0]);
assert.deepEqual(getPendingWaiterState().pending, 1);

Expand Down Expand Up @@ -340,39 +374,73 @@ if (DEBUG) {

class NativeThing {
iterations: Array<Number> = [];
continue: Function = () => null;
_continue?: Function;

@coDec
@waitFor
*doStuffCo(): TaskGenerator<string> {
for (let i = 0; i < 3; i += 1) {
let deferred = new Deferred();
this.continue = deferred.resolve;
yield deferred.promise;
let continuation = new Deferred();
if (this._continue !== undefined) {
throw new Error('pending continue, cannot proceed');
}
let completion = new Deferred();
let continued = false;

this._continue = () => {
if (continued === true) {
throw new Error('Cannot call continue twice on a single iteration');
} else {
continued = true;
}

continuation.resolve();
return completion.promise;
};

try {
yield continuation.promise;
} finally {
completion.resolve();
this._continue = undefined;
}
this.iterations.push(i);
}
return 'done';
}

get continue() {
if (this._continue === undefined) {
throw new Error('Cannot call continue twice on a single iteration');
} else {
try {
return this._continue;
} finally {
// detect invalid usage. Specifically, our test (as written
// currently) would be in-error if any given continue() is invoked more
// then once
this._continue = undefined;
}
}
}
}

test('it works', async function (assert) {
let thing = new NativeThing();

let promise = thing.doStuffCo();
thing.doStuffCo();
assert.deepEqual(getPendingWaiterState().pending, 1);

thing.continue();
await Promise.resolve();
await thing.continue();
assert.deepEqual(thing.iterations, [0]);
assert.deepEqual(getPendingWaiterState().pending, 1);

thing.continue();
await Promise.resolve();
await thing.continue();
assert.deepEqual(thing.iterations, [0, 1]);
assert.deepEqual(getPendingWaiterState().pending, 1);

thing.continue();
await promise;
await thing.continue();

assert.deepEqual(thing.iterations, [0, 1, 2]);
assert.deepEqual(getPendingWaiterState().pending, 0);
});
Expand Down