@@ -70,25 +70,27 @@ function updateToNewEmberQUnitImports(j, root) {
7070 // Remove all existing import specifiers
7171 . remove ( ) ;
7272
73- let renderUsages = findRenderUsages ( j , root ) ;
74- if ( renderUsages . size ( ) > 0 ) {
75- specifiers . add ( 'render' ) ;
76- }
73+ [ 'render' , 'clearRender' ] . forEach ( type => {
74+ let usages = findTestHelperUsageOf ( j , root , type ) ;
75+ if ( usages . size ( ) > 0 ) {
76+ specifiers . add ( type ) ;
77+ }
78+ } ) ;
7779
7880 emberQUnitImports
7981 . get ( 'specifiers' )
8082 . replace ( Array . from ( specifiers ) . map ( s => j . importSpecifier ( j . identifier ( s ) ) ) ) ;
8183}
8284
83- function findRenderUsages ( j , root ) {
85+ function findTestHelperUsageOf ( j , root , property ) {
8486 return root . find ( j . ExpressionStatement , {
8587 expression : {
8688 callee : {
8789 object : {
8890 type : 'ThisExpression' ,
8991 } ,
9092 property : {
91- name : 'render' ,
93+ name : property ,
9294 } ,
9395 } ,
9496 } ,
@@ -184,15 +186,16 @@ function updateModuleForToNestedModule(j, root) {
184186 // mark the test function as an async function
185187 expression . expression . arguments [ 1 ] . async = true ;
186188
187- let renderUsage = findRenderUsages ( j , j ( expression ) ) ;
189+ // Transform to await render() or await clearRender()
190+ [ 'render' , 'clearRender' ] . forEach ( type => {
191+ findTestHelperUsageOf ( j , j ( expression ) , type ) . forEach ( p => {
192+ let expression = p . get ( 'expression' ) ;
188193
189- renderUsage . forEach ( p => {
190- let expression = p . get ( 'expression' ) ;
191-
192- let awaitExpression = j . awaitExpression (
193- j . callExpression ( j . identifier ( 'render' ) , expression . node . arguments )
194- ) ;
195- expression . replace ( awaitExpression ) ;
194+ let awaitExpression = j . awaitExpression (
195+ j . callExpression ( j . identifier ( type ) , expression . node . arguments )
196+ ) ;
197+ expression . replace ( awaitExpression ) ;
198+ } ) ;
196199 } ) ;
197200 }
198201
0 commit comments