restructured the files

laura-codess · laura-codess · commit 8efb91317574 · 2025-07-22T14:47:31.000-04:00
diff --git a/packages/amazonq/test/e2e_new/amazonq/helpers/pinContextHelper.ts b/packages/amazonq/test/e2e_new/amazonq/helpers/pinContextHelper.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { By, WebviewView } from 'vscode-extension-tester'
-import { sleep, waitForElement } from '../utils/generalHelper'
+import { sleep, waitForElement } from '../utils/generalUtils'
 import { WebElement } from 'vscode-extension-tester'
 
 /**
diff --git a/packages/amazonq/test/e2e_new/amazonq/helpers/quickActionsHelper.ts b/packages/amazonq/test/e2e_new/amazonq/helpers/quickActionsHelper.ts
@@ -4,8 +4,8 @@
  */
 
 import { By, WebElement, WebviewView } from 'vscode-extension-tester'
-import { writeToChat } from '../chat/chatHelper'
-import { sleep, waitForElements } from '../utils/generalHelper'
+import { writeToChat } from '../utils/generalUtils'
+import { sleep, waitForElements } from '../utils/generalUtils'
 
 /**
  * Gets all quick action command menu items
diff --git a/packages/amazonq/test/e2e_new/amazonq/helpers/switchModelHelper.ts b/packages/amazonq/test/e2e_new/amazonq/helpers/switchModelHelper.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { By, WebviewView, WebElement } from 'vscode-extension-tester'
-import { waitForElement } from '../utils/generalHelper'
+import { waitForElement } from '../utils/generalUtils'
 
 /**
  * Lists all available model options in the dropdown
diff --git a/packages/amazonq/test/e2e_new/amazonq/tests/chat.test.ts b/packages/amazonq/test/e2e_new/amazonq/tests/chat.test.ts
@@ -5,8 +5,8 @@
 import '../utils/setup'
 import { WebviewView } from 'vscode-extension-tester'
 import { testContext } from '../utils/testContext'
-import { clearChat, waitForChatResponse, writeToChat } from './chatHelper'
-import { closeAllTabs } from '../utils/cleanupHelper'
+import { clearChat, waitForChatResponse, writeToChat } from '../utils/generalUtils'
+import { closeAllTabs } from '../utils/cleanupUtils'
 
 describe('Amazon Q Chat Basic Functionality', function () {
     // this timeout is the general timeout for the entire test suite
diff --git a/packages/amazonq/test/e2e_new/amazonq/tests/pinContext.test.ts b/packages/amazonq/test/e2e_new/amazonq/tests/pinContext.test.ts
@@ -4,10 +4,10 @@
  */
 import '../utils/setup'
 import { WebviewView } from 'vscode-extension-tester'
-import { closeAllTabs, dismissOverlayIfPresent } from '../utils/cleanupHelper'
+import { closeAllTabs, dismissOverlayIfPresent } from '../utils/cleanupUtils'
 import { testContext } from '../utils/testContext'
-import { clickPinContextButton, getPinContextMenuItems, clickPinContextMenuItem } from './pinContextHelper'
-import { clearChat } from '../chat/chatHelper'
+import { clickPinContextButton, getPinContextMenuItems, clickPinContextMenuItem } from '../helpers/pinContextHelper'
+import { clearChat } from '../utils/generalUtils'
 
 describe('Amazon Q Pin Context Functionality', function () {
     // this timeout is the general timeout for the entire test suite
diff --git a/packages/amazonq/test/e2e_new/amazonq/tests/quickActions.test.ts b/packages/amazonq/test/e2e_new/amazonq/tests/quickActions.test.ts
@@ -4,10 +4,10 @@
  */
 import '../utils/setup'
 import { WebviewView } from 'vscode-extension-tester'
-import { closeAllTabs, dismissOverlayIfPresent } from '../utils/cleanupHelper'
+import { closeAllTabs, dismissOverlayIfPresent } from '../utils/cleanupUtils'
 import { testContext } from '../utils/testContext'
-import { clickQuickActionsCommand } from './quickActionsHelper'
-import { clearChat } from '../chat/chatHelper'
+import { clickQuickActionsCommand } from '../helpers/quickActionsHelper'
+import { clearChat } from '../utils/generalUtils'
 
 describe('Amazon Q Chat Quick Actions Functionality', function () {
     // this timeout is the general timeout for the entire test suite
diff --git a/packages/amazonq/test/e2e_new/amazonq/tests/switchModel.test.ts b/packages/amazonq/test/e2e_new/amazonq/tests/switchModel.test.ts
@@ -5,8 +5,8 @@
 import '../utils/setup'
 import { WebviewView } from 'vscode-extension-tester'
 import { testContext } from '../utils/testContext'
-import { listModels, selectModel } from './switchModelHelper'
-import { closeAllTabs } from '../utils/cleanupHelper'
+import { listModels, selectModel } from '../helpers/switchModelHelper'
+import { closeAllTabs } from '../utils/cleanupUtils'
 
 describe('Amazon Q Switch Model Functionality', function () {
     // this timeout is the general timeout for the entire test suite
diff --git a/packages/amazonq/test/e2e_new/amazonq/utils/authUtils.ts b/packages/amazonq/test/e2e_new/amazonq/utils/authUtils.ts
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { Workbench, By, WebviewView } from 'vscode-extension-tester'
-import { findItemByText, sleep, waitForElements } from '../utils/generalHelper'
-import { testContext } from '../utils/testContext'
+import { findItemByText, sleep, waitForElements } from './generalUtils'
+import { testContext } from './testContext'
 
 /* Completes the entire Amazon Q login flow
 
diff --git a/packages/amazonq/test/e2e_new/amazonq/utils/cleanupUtils.ts b/packages/amazonq/test/e2e_new/amazonq/utils/cleanupUtils.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { By, WebviewView } from 'vscode-extension-tester'
-import { sleep } from './generalHelper'
+import { sleep } from './generalUtils'
 
 /**
  * Closes all open chat tabs
diff --git a/packages/amazonq/test/e2e_new/amazonq/utils/generalHelper.ts b/packages/amazonq/test/e2e_new/amazonq/utils/generalHelper.ts
diff --git a/packages/amazonq/test/e2e_new/amazonq/utils/generalUtils.ts b/packages/amazonq/test/e2e_new/amazonq/utils/generalUtils.ts
@@ -2,8 +2,42 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { By, WebviewView } from 'vscode-extension-tester'
-import { sleep, waitForElement } from '../utils/generalHelper'
+import { By, WebviewView, WebElement } from 'vscode-extension-tester'
+import { until } from 'selenium-webdriver'
+
+/**
+ * General sleep function to wait for a specified amount of time
+ * @param timeout Time in miliseconds
+ */
+export async function sleep(timeout: number) {
+    await new Promise((resolve) => setTimeout(resolve, timeout))
+}
+
+/**
+ * Waits for an element to be located, if there are multiple elements with the same locator it will just return the first one
+ * @param webview The WebviewView instance
+ * @param locator The selenium locator
+ * @param timeout The timeout in milliseconds (Optional)
+ * @returns Promise<WebElement> Returns the element found
+ */
+export async function waitForElement(webview: WebviewView, locator: By, timeout?: number): Promise<WebElement> {
+    const driver = webview.getDriver()
+    await driver.wait(until.elementsLocated(locator), timeout)
+    return await webview.findWebElement(locator)
+}
+
+/**
+ * Waits for multiple elements with the same css selector to be located
+ * @param webview The WebviewView instance
+ * @param locator The selenium locator
+ * @param timeout The timeout in milliseconds (Optional)
+ * @returns Promise<WebElement[]> Returns an array of elements found
+ */
+export async function waitForElements(webview: WebviewView, locator: By, timeout?: number): Promise<WebElement[]> {
+    const driver = webview.getDriver()
+    await driver.wait(until.elementsLocated(locator), timeout)
+    return await webview.findWebElements(locator)
+}
 
 /**
  * Writes text to the chat input and optionally sends it
@@ -69,3 +103,23 @@ export async function clearChat(webview: WebviewView): Promise<boolean> {
         return false
     }
 }
+
+/**
+ * Finds an item based on the text
+ * @param items WebElement array to search
+ * @param text The text of the item
+ * @returns Promise<WebElement> The first element that contains the specified text
+ * TO-DO: Make this function more general by eliminated the By.css('.title')
+ */
+export async function findItemByText(items: WebElement[], text: string) {
+    for (const item of items) {
+        const titleDivs = await item.findElements(By.css('.title'))
+        for (const titleDiv of titleDivs) {
+            const titleText = await titleDiv.getText()
+            if (titleText?.trim().startsWith(text)) {
+                return item
+            }
+        }
+    }
+    throw new Error(`Item with text "${text}" not found`)
+}
diff --git a/packages/amazonq/test/e2e_new/amazonq/utils/setup.ts b/packages/amazonq/test/e2e_new/amazonq/utils/setup.ts
@@ -2,12 +2,16 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { signInToAmazonQ } from '../auth/authHelper'
+import { signInToAmazonQ } from './authUtils'
+import { testContext } from './testContext'
+import { closeAllTabs } from './cleanupUtils'
 
 before(async function () {
     this.timeout(60000)
     console.log('\n\n*** MANUAL INTERVENTION REQUIRED ***')
     console.log('When prompted, you must manually click to open the browser and complete authentication')
     console.log('You have 60 seconds to complete this step\n\n')
     await signInToAmazonQ()
+    const webviewView = testContext.webviewView
+    await closeAllTabs(webviewView)
 })
