Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions packages/amazonq/test/e2e/amazonq/framework/framework.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,12 @@ export class qTestingFramework {
await ui.messageReceiver(event)
})
)

/**
* We need to manually indicate that the UI is ready since we are using a custom mynah UI event routing
* implementation instead of routing events through the real webview
**/
DefaultAmazonQAppInitContext.instance.getAppsToWebViewMessagePublisher().setUiReady()
}

/**
Expand Down
8 changes: 4 additions & 4 deletions packages/amazonq/test/e2e/amazonq/framework/messenger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,9 @@ export class Messenger {
* Wait until the chat has finished loading. This happens when a backend request
* has finished and responded in the chat
*/
await waitUntil(
() => {
return Promise.resolve(event())
const ok = await waitUntil(
async () => {
return event()
},
{
interval: waitOverrides ? waitOverrides.waitIntervalInMs : this.waitIntervalInMs,
Expand All @@ -202,7 +202,7 @@ export class Messenger {
)

// Do another check just in case the waitUntil time'd out
if (!event()) {
if (!ok) {
assert.fail(
`Event has not finished loading in: ${waitOverrides ? waitOverrides.waitTimeoutInMs : this.waitTimeoutInMs} ms`
)
Expand Down
Loading