@@ -2389,20 +2389,26 @@ module('integration tests', () => {
2389
2389
let myTask = taskFor ( this . myTask ) ;
2390
2390
2391
2391
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 } > > ( ) ;
2393
2394
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 > ( ) ;
2395
2397
expect ( myTask . perform ) . toBeCallableWith ( true ) ;
2396
2398
expect ( myTask . perform ) . toBeCallableWith ( false , 500 ) ;
2397
2399
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 } > ( ) ;
2399
2402
2400
2403
let myTaskInstance = myTask . perform ( true ) ;
2401
2404
2402
2405
expect ( myTaskInstance ) . not . toBeAny ( ) ;
2403
- expect ( myTaskInstance ) . toEqualTypeOf < TaskInstance < string > > ( ) ;
2406
+ expect ( myTaskInstance ) . toMatchTypeOf < TaskInstance < string > > ( ) ;
2407
+ expect ( myTaskInstance ) . toEqualTypeOf < TaskInstance < string > & { bar : boolean } > ( ) ;
2404
2408
expect ( myTaskInstance . isRunning ) . toBeBoolean ( ) ;
2405
2409
expect ( myTaskInstance . value ) . toEqualTypeOf < string | null > ( ) ;
2410
+ expect ( myTaskInstance . bar ) . not . toBeAny ( ) ;
2411
+ expect ( myTaskInstance . bar ) . toBeBoolean ( ) ;
2406
2412
expect ( myTaskInstance ) . toMatchTypeOf < Promise < string > > ( ) ;
2407
2413
2408
2414
let result = await myTaskInstance ;
0 commit comments