@@ -142,6 +142,11 @@ describe('WorkflowHistory', () => {
142
142
hasNextPage : true ,
143
143
} ) ;
144
144
145
+ await waitFor ( ( ) => {
146
+ expect ( screen . getByText ( 'keep loading events' ) ) . toBeInTheDocument ( ) ;
147
+ } ) ;
148
+
149
+ // Load first page
145
150
await act ( async ( ) => {
146
151
const resolver = getRequestResolver ( ) ;
147
152
resolver ( {
@@ -154,9 +159,11 @@ describe('WorkflowHistory', () => {
154
159
} ) ;
155
160
} ) ;
156
161
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
+ } ) ;
159
165
166
+ // Load second page
160
167
await act ( async ( ) => {
161
168
const secondPageResolver = getRequestResolver ( ) ;
162
169
secondPageResolver ( {
@@ -205,6 +212,7 @@ async function setup({
205
212
const getRequestResolver = ( ) => requestResolver ;
206
213
const getRequestRejector = ( ) => requestRejector ;
207
214
let requestIndex = - 1 ;
215
+
208
216
const renderResult = render (
209
217
< Suspense fallback = { 'Suspense placeholder' } >
210
218
< WorkflowHistory
@@ -225,10 +233,12 @@ async function setup({
225
233
mockOnce : false ,
226
234
httpResolver : async ( ) => {
227
235
requestIndex = requestIndex + 1 ;
236
+
228
237
if ( requestIndex > 0 && resolveLoadMoreManually ) {
229
238
return await new Promise ( ( resolve , reject ) => {
230
239
requestResolver = ( result : GetWorkflowHistoryResponse ) =>
231
240
resolve ( HttpResponse . json ( result , { status : 200 } ) ) ;
241
+
232
242
requestRejector = ( ) =>
233
243
reject (
234
244
HttpResponse . json (
@@ -238,11 +248,12 @@ async function setup({
238
248
) ;
239
249
} ) ;
240
250
} else {
241
- if ( error )
251
+ if ( error ) {
242
252
return HttpResponse . json (
243
253
{ message : 'Failed to fetch workflow history' } ,
244
254
{ status : 500 }
245
255
) ;
256
+ }
246
257
247
258
return HttpResponse . json (
248
259
{
0 commit comments