test(amazonq): wait for a trigger decision before finishing inline completion tests

Author: jpinkney-aws

packages/amazonq/test/e2e/inline/inline.test.ts

@@ -6,7 +6,6 @@
 import * as vscode from 'vscode'
 import assert from 'assert'
 import {
-    assertTelemetry,
     closeAllEditors,
     getTestWindow,
     registerAuthHook,
@@ -65,21 +64,25 @@ describe('Amazon Q Inline', async function () {
         }
     }
 
-    async function waitForTelemetry() {
-        const ok = await waitUntil(
-            async () =>
-                globals.telemetry.logger.query({
-                    metricName: 'codewhisperer_userTriggerDecision',
-                }).length > 0,
-            waitOptions
-        )
+    async function lastTriggerDecision() {
+        const ok = await waitUntil(async () => {
+            const telem = globals.telemetry.logger.query({
+                metricName: 'codewhisperer_userTriggerDecision',
+            })
+            return telem.some((item) => item.codewhispererSuggestionState !== 'Empty')
+        }, waitOptions)
         if (!ok) {
             assert.fail('Telemetry failed to be emitted')
         }
+
+        const events = globals.telemetry.logger.query({
+            metricName: 'codewhisperer_userTriggerDecision',
+        })
+        return events[events.length - 1].codewhispererSuggestionState
     }
 
     for (const [name, invokeCompletion] of [
-        ['automatic', async () => await vscode.commands.executeCommand('type', { text: '\n' })],
+        ['automatic', async () => vscode.commands.executeCommand('type', { text: '\n' })],
         ['manual', async () => Commands.tryExecute('aws.amazonq.invokeInlineCompletion')],
     ] as const) {
         describe(`${name} invoke`, async function () {
@@ -119,10 +122,8 @@ describe('Amazon Q Inline', async function () {
 
                     assert.ok(suggestionAccepted, 'Editor contents should have changed')
 
-                    await waitForTelemetry()
-                    assertTelemetry('codewhisperer_userTriggerDecision', {
-                        codewhispererSuggestionState: 'Accept',
-                    })
+                    const decision = await lastTriggerDecision()
+                    assert.deepStrictEqual(decision, 'Accept')
                 })
 
                 it(`${name} invoke reject`, async function () {
@@ -132,10 +133,8 @@ describe('Amazon Q Inline', async function () {
                     // Contents haven't changed
                     assert.deepStrictEqual(vscode.window.activeTextEditor?.document.getText(), originalEditorContents)
 
-                    await waitForTelemetry()
-                    assertTelemetry('codewhisperer_userTriggerDecision', {
-                        codewhispererSuggestionState: 'Reject',
-                    })
+                    const decision = await lastTriggerDecision()
+                    assert.deepStrictEqual(decision, 'Reject')
                 })
 
                 it(`${name} invoke discard`, async function () {