Skip to content

Commit 88dc997

Browse files
committed
Test with updated e-c-ts
1 parent 3db4007 commit 88dc997

File tree

3 files changed

+204
-228
lines changed

3 files changed

+204
-228
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343
"ember-cli-template-lint": "^1.0.0-beta.1",
4444
"ember-cli-uglify": "^2.1.0",
4545
"ember-code-snippet": "^2.4.0",
46-
"ember-concurrency-async": "^0.2.0",
46+
"ember-concurrency-async": "chancancode/ember-concurrency-async#encapsulated-task-v2",
4747
"ember-concurrency-decorators": "^2.0.0",
48-
"ember-concurrency-ts": "^0.1.0",
48+
"ember-concurrency-ts": "chancancode/ember-concurrency-ts#encapsulated-task-v2",
4949
"ember-disable-prototype-extensions": "^1.1.3",
5050
"ember-disable-proxy-controllers": "^1.0.1",
5151
"ember-export-application-global": "^2.0.0",

tests/types/ember-concurrency-test.ts

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2389,20 +2389,26 @@ module('integration tests', () => {
23892389
let myTask = taskFor(this.myTask);
23902390

23912391
expect(myTask).not.toBeAny();
2392-
expect(myTask).toEqualTypeOf<Task<string, [boolean, number?]>>();
2392+
expect(myTask).toMatchTypeOf<Task<string, [boolean, number?]>>();
2393+
expect(myTask).toEqualTypeOf<EncapsulatedTask<string, [boolean, number?], { bar: boolean }>>();
23932394
expect(myTask.isRunning).toBeBoolean();
2394-
expect(myTask.last).toEqualTypeOf<TaskInstance<string> | null>();
2395+
expect(myTask.last).toMatchTypeOf<TaskInstance<string> | null>();
2396+
expect(myTask.last).toEqualTypeOf<TaskInstance<string> & { bar: boolean } | null>();
23952397
expect(myTask.perform).toBeCallableWith(true);
23962398
expect(myTask.perform).toBeCallableWith(false, 500);
23972399
expect(myTask.perform).parameters.toEqualTypeOf<[boolean, number?]>();
2398-
expect(myTask.perform).returns.toEqualTypeOf<TaskInstance<string>>();
2400+
expect(myTask.perform).returns.toMatchTypeOf<TaskInstance<string>>();
2401+
expect(myTask.perform).returns.toEqualTypeOf<TaskInstance<string> & { bar: boolean }>();
23992402

24002403
let myTaskInstance = myTask.perform(true);
24012404

24022405
expect(myTaskInstance).not.toBeAny();
2403-
expect(myTaskInstance).toEqualTypeOf<TaskInstance<string>>();
2406+
expect(myTaskInstance).toMatchTypeOf<TaskInstance<string>>();
2407+
expect(myTaskInstance).toEqualTypeOf<TaskInstance<string> & { bar: boolean }>();
24042408
expect(myTaskInstance.isRunning).toBeBoolean();
24052409
expect(myTaskInstance.value).toEqualTypeOf<string | null>();
2410+
expect(myTaskInstance.bar).not.toBeAny();
2411+
expect(myTaskInstance.bar).toBeBoolean();
24062412
expect(myTaskInstance).toMatchTypeOf<Promise<string>>();
24072413

24082414
let result = await myTaskInstance;

0 commit comments

Comments
 (0)