@@ -142,6 +142,11 @@ describe('WorkflowHistory', () => {
142142 hasNextPage : true ,
143143 } ) ;
144144
145+ await waitFor ( ( ) => {
146+ expect ( screen . getByText ( 'keep loading events' ) ) . toBeInTheDocument ( ) ;
147+ } ) ;
148+
149+ // Load first page
145150 await act ( async ( ) => {
146151 const resolver = getRequestResolver ( ) ;
147152 resolver ( {
@@ -154,9 +159,11 @@ describe('WorkflowHistory', () => {
154159 } ) ;
155160 } ) ;
156161
157- const loadingIndicator = await screen . findByText ( 'keep loading events' ) ;
158- expect ( loadingIndicator ) . toBeInTheDocument ( ) ;
162+ await waitFor ( ( ) => {
163+ expect ( screen . getByText ( 'keep loading events' ) ) . toBeInTheDocument ( ) ;
164+ } ) ;
159165
166+ // Load second page
160167 await act ( async ( ) => {
161168 const secondPageResolver = getRequestResolver ( ) ;
162169 secondPageResolver ( {
@@ -205,6 +212,7 @@ async function setup({
205212 const getRequestResolver = ( ) => requestResolver ;
206213 const getRequestRejector = ( ) => requestRejector ;
207214 let requestIndex = - 1 ;
215+
208216 const renderResult = render (
209217 < Suspense fallback = { 'Suspense placeholder' } >
210218 < WorkflowHistory
@@ -225,10 +233,12 @@ async function setup({
225233 mockOnce : false ,
226234 httpResolver : async ( ) => {
227235 requestIndex = requestIndex + 1 ;
236+
228237 if ( requestIndex > 0 && resolveLoadMoreManually ) {
229238 return await new Promise ( ( resolve , reject ) => {
230239 requestResolver = ( result : GetWorkflowHistoryResponse ) =>
231240 resolve ( HttpResponse . json ( result , { status : 200 } ) ) ;
241+
232242 requestRejector = ( ) =>
233243 reject (
234244 HttpResponse . json (
@@ -238,11 +248,12 @@ async function setup({
238248 ) ;
239249 } ) ;
240250 } else {
241- if ( error )
251+ if ( error ) {
242252 return HttpResponse . json (
243253 { message : 'Failed to fetch workflow history' } ,
244254 { status : 500 }
245255 ) ;
256+ }
246257
247258 return HttpResponse . json (
248259 {
0 commit comments