changes based on the comments

Author: laura-codess

packages/amazonq/test/e2e_new/amazonq/tests/inline.test.ts

@@ -5,7 +5,7 @@
 import '../utils/setup'
 import { Workbench, EditorView, InputBox, TextEditor, WebviewView, Key } from 'vscode-extension-tester'
 import { testContext } from '../utils/testContext'
-import { sleep, expect, pressKey, createNewTextFile } from '../utils/generalUtils'
+import { sleep, expect, pressKey, createNewTextFile, writeToTextEditor } from '../utils/generalUtils'
 
 describe('Amazon Q Inline Completion / Chat Functionality', function () {
     // this timeout is the general timeout for the entire test suite
@@ -27,19 +27,17 @@ describe('Amazon Q Inline Completion / Chat Functionality', function () {
     })
 
     it('Inline Test', async () => {
-        await textEditor.typeTextAt(1, 1, 'Select Me')
+        await writeToTextEditor(textEditor, 'Select Me')
         const text = await textEditor.getText()
         expect(text).equals('Select Me')
         await textEditor.clearText()
+
         await workbench.executeCommand('Amazon Q: Inline Chat')
         const input = new InputBox()
         await input.sendKeys('Write a simple sentece')
         await input.sendKeys(Key.ENTER)
-        await sleep(5000)
         const driver = textEditor.getDriver()
         await pressKey(driver, 'ENTER')
-        await sleep(3000)
         await pressKey(driver, 'TAB')
-        await sleep(3000)
     })
 })

packages/amazonq/test/e2e_new/amazonq/utils/generalUtils.ts

@@ -73,58 +73,24 @@ export async function pressKey(driver: WebDriver, key: keyof typeof Key): Promis
     await driver.actions().sendKeys(key).perform()
 }
 
-type OSType = 'windows' | 'mac'
-type modifierKey = 'alt' | 'ctrl' | 'shift' | 'option' | 'command'
-
-const MODIFIERKEYS: Record<OSType, Record<modifierKey, string>> = {
-    windows: {
-        alt: Key.ALT,
-        ctrl: Key.CONTROL,
-        shift: Key.SHIFT,
-        option: Key.ALT,
-        command: Key.COMMAND,
-    },
-    mac: {
-        alt: Key.ALT,
-        ctrl: Key.CONTROL,
-        shift: Key.SHIFT,
-        option: Key.ALT,
-        command: Key.COMMAND,
-    },
-}
-
 /**
  * Presses a keyboard shortcut with modifier keys
  * @param driver The WebDriver instance
- * @param key The key to press
- * @param modifier The modifier key(s)
- * @param osType The operating system type
+ * @param key The keys to press
+ *
+ * Examples:
+ * Ctrl + C | await pressShortcut(driver, Key.CONTROL, 'c')
+ * Ctrl + Shift + T | await pressShortcut(driver, Key.CONTROL, Key.SHIFT, 't')
  */
-export async function pressShortcut(
-    driver: WebDriver,
-    key: string,
-    modifier: modifierKey | modifierKey[],
-    osType: OSType = 'windows'
-): Promise<void> {
-    const actions = driver.actions({ bridge: true })
-
-    try {
-        const modifiers = Array.isArray(modifier) ? modifier : modifier ? [modifier] : []
-        for (const mod of modifiers) {
-            if (!(mod in MODIFIERKEYS[osType])) {
-                throw new Error(`Invalid modifier key '${mod}' for ${osType}`)
-            }
-            actions.keyDown(MODIFIERKEYS[osType][mod])
-        }
-        actions.sendKeys(key)
-        for (const mod of modifiers.reverse()) {
-            actions.keyUp(MODIFIERKEYS[osType][mod])
-        }
-        await actions.perform()
-    } catch (error) {
-        console.error(`Error performing keyboard shortcut: ${error}`)
-        throw error
+export async function pressShortcut(driver: WebDriver, ...keys: (keyof typeof Key)[]): Promise<void> {
+    const actions = driver.actions()
+    for (const key of keys) {
+        actions.keyDown(key)
     }
+    for (const key of keys.reverse()) {
+        actions.keyUp(key)
+    }
+    await actions.perform()
 }
 
 /**
@@ -205,6 +171,18 @@ export async function createNewTextFile(workbench: Workbench, editorView: Editor
     return textEditor
 }
 
+/**
+ * Writes the given string in the textEditor in the next empty line
+ * @param textEditor The TextEditor instance
+ * @param text The text the user wants to type
+ * @returns Promise<void>
+ */
+export async function writeToTextEditor(textEditor: TextEditor, text: string): Promise<void> {
+    const currentLines = await textEditor.getNumberOfLines()
+    const nextLine = currentLines + 1
+    await textEditor.typeTextAt(nextLine, 1, text)
+}
+
 /**
  * Finds an item based on the text
  * @param items WebElement array to search