11import { test , suite , assert } from '../x-test.js' ;
22import { XTestRoot } from '../x-test-root.js' ;
3- import { assertThrows } from './shared.js' ;
43
54// Dependency injection.
65const getContext = ( ) => {
@@ -170,7 +169,8 @@ suite('onDefer', () => {
170169 test ( 'throws on unknown defer type' , ( ) => {
171170 const { context } = getContext ( ) ;
172171 const event = { data : { data : { type : 'unknown' } } } ;
173- assertThrows ( ( ) => XTestRoot . onDefer ( context , event ) , / U n e x p e c t e d d e f e r t y p e " u n k n o w n " \. / ) ;
172+ const fn = ( ) => XTestRoot . onDefer ( context , event ) ;
173+ assert . throws ( fn , / U n e x p e c t e d d e f e r t y p e " u n k n o w n " \. / ) ;
174174 } ) ;
175175} ) ;
176176
@@ -207,7 +207,8 @@ suite('handleEmptyPlan', () => {
207207 test ( 'throws when no subtest line is in the queue' , ( ) => {
208208 const { context } = getContext ( ) ;
209209 context . state . queue = [ ] ;
210- assertThrows ( ( ) => XTestRoot . handleEmptyPlan ( context ) , / E x p e c t e d t o f i n d m a t c h i n g s u b t e s t / ) ;
210+ const fn = ( ) => XTestRoot . handleEmptyPlan ( context ) ;
211+ assert . throws ( fn , / E x p e c t e d t o f i n d m a t c h i n g s u b t e s t / ) ;
211212 } ) ;
212213} ) ;
213214
@@ -336,7 +337,8 @@ suite('handleFilteredOutput', () => {
336337 context . state . queue = [ ] ;
337338 context . state . stepIds . push ( 's' ) ;
338339 context . state . steps [ 's' ] = { type : 'unknown' } ;
339- assertThrows ( ( ) => XTestRoot . handleFilteredOutput ( context , [ ] , 's' ) , / U n e x p e c t e d s t e p t y p e " u n k n o w n " / ) ;
340+ const fn = ( ) => XTestRoot . handleFilteredOutput ( context , [ ] , 's' ) ;
341+ assert . throws ( fn , / U n e x p e c t e d s t e p t y p e " u n k n o w n " / ) ;
340342 } ) ;
341343} ) ;
342344
@@ -347,7 +349,8 @@ suite('onResult', () => {
347349 context . state . stepIds . push ( 'ts' ) ;
348350 context . state . steps [ 'ts' ] = { type : 'test' , testId : 't' , status : 'waiting' } ;
349351 const event = { data : { data : { testId : 't' } } } ;
350- assertThrows ( ( ) => XTestRoot . onResult ( context , event ) , / s t e p t o c o m p l e t e i s n o t r u n n i n g / ) ;
352+ const fn = ( ) => XTestRoot . onResult ( context , event ) ;
353+ assert . throws ( fn , / s t e p t o c o m p l e t e i s n o t r u n n i n g / ) ;
351354 } ) ;
352355} ) ;
353356
@@ -368,7 +371,8 @@ suite('onReady', () => {
368371 context . state . frames [ 'f' ] = { href : 'http://test.html' , children : [ ] } ;
369372 context . state . stepIds . push ( 'fs' ) ;
370373 context . state . steps [ 'fs' ] = { type : 'frame-start' , frameId : 'f' , status : 'waiting' } ;
371- assertThrows ( ( ) => XTestRoot . onReady ( context , { data : { data : { frameId : 'f' } } } ) , / f r a m e t o r e a d y i s n o t r u n n i n g / ) ;
374+ const fn = ( ) => XTestRoot . onReady ( context , { data : { data : { frameId : 'f' } } } ) ;
375+ assert . throws ( fn , / f r a m e t o r e a d y i s n o t r u n n i n g / ) ;
372376 } ) ;
373377
374378 test ( 'inherits suite directive onto tests without one' , ( ) => {
@@ -387,7 +391,8 @@ suite('onRegister', () => {
387391 test ( 'throws on unknown registration type' , ( ) => {
388392 const { context } = getContext ( ) ;
389393 const event = { data : { data : { type : 'unknown' } } } ;
390- assertThrows ( ( ) => XTestRoot . onRegister ( context , event ) , / U n e x p e c t e d r e g i s t r a t i o n t y p e " u n k n o w n " \. / ) ;
394+ const fn = ( ) => XTestRoot . onRegister ( context , event ) ;
395+ assert . throws ( fn , / U n e x p e c t e d r e g i s t r a t i o n t y p e " u n k n o w n " \. / ) ;
391396 } ) ;
392397} ) ;
393398
@@ -470,7 +475,8 @@ suite('registerTest', () => {
470475suite ( 'childOk' , ( ) => {
471476 test ( 'throws on unknown child type' , ( ) => {
472477 const { context } = getContext ( ) ;
473- assertThrows ( ( ) => XTestRoot . childOk ( context , { type : 'unknown' } ) , / U n e x p e c t e d t y p e " u n k n o w n " / ) ;
478+ const fn = ( ) => XTestRoot . childOk ( context , { type : 'unknown' } ) ;
479+ assert . throws ( fn , / U n e x p e c t e d t y p e " u n k n o w n " / ) ;
474480 } ) ;
475481} ) ;
476482
@@ -479,7 +485,8 @@ suite('href', () => {
479485 const { context } = getContext ( ) ;
480486 context . state . stepIds . push ( 's' ) ;
481487 context . state . steps [ 's' ] = { type : 'unknown' } ;
482- assertThrows ( ( ) => XTestRoot . href ( context , 's' ) , / U n e x p e c t e d t y p e " u n k n o w n " / ) ;
488+ const fn = ( ) => XTestRoot . href ( context , 's' ) ;
489+ assert . throws ( fn , / U n e x p e c t e d t y p e " u n k n o w n " / ) ;
483490 } ) ;
484491} ) ;
485492
@@ -488,7 +495,8 @@ suite('directive', () => {
488495 const { context } = getContext ( ) ;
489496 context . state . stepIds . push ( 's' ) ;
490497 context . state . steps [ 's' ] = { type : 'unknown' } ;
491- assertThrows ( ( ) => XTestRoot . directive ( context , 's' ) , / U n e x p e c t e d t y p e " u n k n o w n " / ) ;
498+ const fn = ( ) => XTestRoot . directive ( context , 's' ) ;
499+ assert . throws ( fn , / U n e x p e c t e d t y p e " u n k n o w n " / ) ;
492500 } ) ;
493501} ) ;
494502
@@ -497,7 +505,8 @@ suite('level', () => {
497505 const { context } = getContext ( ) ;
498506 context . state . stepIds . push ( 's' ) ;
499507 context . state . steps [ 's' ] = { type : 'unknown' } ;
500- assertThrows ( ( ) => XTestRoot . level ( context , 's' ) , / U n e x p e c t e d t y p e " u n k n o w n " / ) ;
508+ const fn = ( ) => XTestRoot . level ( context , 's' ) ;
509+ assert . throws ( fn , / U n e x p e c t e d t y p e " u n k n o w n " / ) ;
501510 } ) ;
502511} ) ;
503512
@@ -506,7 +515,8 @@ suite('count', () => {
506515 const { context } = getContext ( ) ;
507516 context . state . stepIds . push ( 's' ) ;
508517 context . state . steps [ 's' ] = { type : 'unknown' } ;
509- assertThrows ( ( ) => XTestRoot . count ( context , 's' ) , / U n e x p e c t e d t y p e " u n k n o w n " / ) ;
518+ const fn = ( ) => XTestRoot . count ( context , 's' ) ;
519+ assert . throws ( fn , / U n e x p e c t e d t y p e " u n k n o w n " / ) ;
510520 } ) ;
511521} ) ;
512522
@@ -515,7 +525,8 @@ suite('yaml', () => {
515525 const { context } = getContext ( ) ;
516526 context . state . stepIds . push ( 's' ) ;
517527 context . state . steps [ 's' ] = { type : 'unknown' } ;
518- assertThrows ( ( ) => XTestRoot . yaml ( context , 's' ) , / U n e x p e c t e d t y p e " u n k n o w n " / ) ;
528+ const fn = ( ) => XTestRoot . yaml ( context , 's' ) ;
529+ assert . throws ( fn , / U n e x p e c t e d t y p e " u n k n o w n " / ) ;
519530 } ) ;
520531} ) ;
521532
@@ -524,7 +535,8 @@ suite('text', () => {
524535 const { context } = getContext ( ) ;
525536 context . state . stepIds . push ( 's' ) ;
526537 context . state . steps [ 's' ] = { type : 'unknown' } ;
527- assertThrows ( ( ) => XTestRoot . text ( context , 's' ) , / U n e x p e c t e d t y p e " u n k n o w n " / ) ;
538+ const fn = ( ) => XTestRoot . text ( context , 's' ) ;
539+ assert . throws ( fn , / U n e x p e c t e d t y p e " u n k n o w n " / ) ;
528540 } ) ;
529541} ) ;
530542
@@ -533,7 +545,8 @@ suite('number', () => {
533545 const { context } = getContext ( ) ;
534546 context . state . stepIds . push ( 's' ) ;
535547 context . state . steps [ 's' ] = { type : 'unknown' } ;
536- assertThrows ( ( ) => XTestRoot . number ( context , 's' ) , / U n e x p e c t e d t y p e " u n k n o w n " / ) ;
548+ const fn = ( ) => XTestRoot . number ( context , 's' ) ;
549+ assert . throws ( fn , / U n e x p e c t e d t y p e " u n k n o w n " / ) ;
537550 } ) ;
538551
539552 test ( 'returns position for a test whose direct parent is a frame' , ( ) => {
@@ -551,7 +564,8 @@ suite('ok', () => {
551564 const { context } = getContext ( ) ;
552565 context . state . stepIds . push ( 's' ) ;
553566 context . state . steps [ 's' ] = { type : 'unknown' } ;
554- assertThrows ( ( ) => XTestRoot . ok ( context , 's' ) , / U n e x p e c t e d t y p e " u n k n o w n " / ) ;
567+ const fn = ( ) => XTestRoot . ok ( context , 's' ) ;
568+ assert . throws ( fn , / U n e x p e c t e d t y p e " u n k n o w n " / ) ;
555569 } ) ;
556570} ) ;
557571
@@ -569,7 +583,8 @@ suite('check', () => {
569583 const { context } = getContext ( ) ;
570584 context . state . stepIds . push ( 's' ) ;
571585 context . state . steps [ 's' ] = { type : 'unknown' , status : 'waiting' } ;
572- assertThrows ( ( ) => XTestRoot . check ( context ) , / U n e x p e c t e d s t e p t y p e " u n k n o w n " / ) ;
586+ const fn = ( ) => XTestRoot . check ( context ) ;
587+ assert . throws ( fn , / U n e x p e c t e d s t e p t y p e " u n k n o w n " / ) ;
573588 } ) ;
574589
575590 test ( 'does not kick off the exit step once the run has ended (e.g. after a bail)' , ( ) => {
0 commit comments