From c66bf184936a78ec9a83db61b000ccdaeeb83f25 Mon Sep 17 00:00:00 2001
From: Abhishek Anne <abhishek.anne@gmail.com>
Date: Wed, 6 Aug 2025 16:33:29 +0530
Subject: [PATCH] Added additonal test cases

---
 .../amazonq/helpers/pinContextHelper.ts       |  3 +-
 .../test/e2e_new/amazonq/tests/chat.test.ts   |  2 +-
 .../e2e_new/amazonq/tests/pinContext.test.ts  | 34 ++++++++++++++++---
 .../amazonq/tests/quickActions.test.ts        | 30 +++++++++++++++-
 .../e2e_new/amazonq/tests/switchModel.test.ts |  7 +++-
 .../test/e2e_new/amazonq/utils/authUtils.ts   | 10 +++++-
 6 files changed, 77 insertions(+), 9 deletions(-)

diff --git a/packages/amazonq/test/e2e_new/amazonq/helpers/pinContextHelper.ts b/packages/amazonq/test/e2e_new/amazonq/helpers/pinContextHelper.ts
index aa58ea2d75d..d1683f9689d 100644
--- a/packages/amazonq/test/e2e_new/amazonq/helpers/pinContextHelper.ts
+++ b/packages/amazonq/test/e2e_new/amazonq/helpers/pinContextHelper.ts
@@ -22,7 +22,7 @@ export async function clickPinContextButton(webview: WebviewView): Promise<boole
             const label = await button.findElement(By.css('.mynah-button-label'))
             const labelText = await label.getText()
             console.log('THE BUTTON TEXT LABEL IS:', labelText)
-            if (labelText === '@Pin Context') {
+            if (labelText === '@Pin Context' || labelText === '@') {
                 console.log('Found Pin Context button, clicking...')
                 await button.click()
                 return true
@@ -81,6 +81,7 @@ export async function clickPinContextMenuItem(webview: WebviewView, itemName: st
         const menuList = await waitForElement(webview, By.css('.mynah-detailed-list-items-block'))
         await sleep(3000)
         const menuListItems = await menuList.findElements(By.css('.mynah-detailed-list-item.mynah-ui-clickable-item'))
+        console.log('Searching for context item:', itemName)
         for (const item of menuListItems) {
             try {
                 const textWrapper = await item.findElement(By.css('.mynah-detailed-list-item-text'))
diff --git a/packages/amazonq/test/e2e_new/amazonq/tests/chat.test.ts b/packages/amazonq/test/e2e_new/amazonq/tests/chat.test.ts
index 1f9cdc44634..20cd9e19d75 100644
--- a/packages/amazonq/test/e2e_new/amazonq/tests/chat.test.ts
+++ b/packages/amazonq/test/e2e_new/amazonq/tests/chat.test.ts
@@ -10,7 +10,7 @@ import { closeAllTabs } from '../utils/cleanupUtils'
 
 describe('Amazon Q Chat Basic Functionality', function () {
     // this timeout is the general timeout for the entire test suite
-    this.timeout(150000)
+    this.timeout(400000)
     let webviewView: WebviewView
 
     before(async function () {
diff --git a/packages/amazonq/test/e2e_new/amazonq/tests/pinContext.test.ts b/packages/amazonq/test/e2e_new/amazonq/tests/pinContext.test.ts
index 4e6c9c5a477..9746238e2aa 100644
--- a/packages/amazonq/test/e2e_new/amazonq/tests/pinContext.test.ts
+++ b/packages/amazonq/test/e2e_new/amazonq/tests/pinContext.test.ts
@@ -7,15 +7,16 @@ import { WebviewView } from 'vscode-extension-tester'
 import { closeAllTabs, dismissOverlayIfPresent } from '../utils/cleanupUtils'
 import { testContext } from '../utils/testContext'
 import { clickPinContextButton, getPinContextMenuItems, clickPinContextMenuItem } from '../helpers/pinContextHelper'
-import { clearChat } from '../utils/generalUtils'
+import { clearChat, sleep } from '../utils/generalUtils'
 
 describe('Amazon Q Pin Context Functionality', function () {
     // this timeout is the general timeout for the entire test suite
-    this.timeout(150000)
+    this.timeout(50000)
     let webviewView: WebviewView
 
-    before(async function () {
+    beforeEach(async function () {
         webviewView = testContext.webviewView
+        await sleep(5000)
     })
 
     after(async function () {
@@ -27,9 +28,34 @@ describe('Amazon Q Pin Context Functionality', function () {
         await clearChat(webviewView)
     })
 
-    it('Pin Context Test', async () => {
+    it('Pin Context Test @workspace', async () => {
         await clickPinContextButton(webviewView)
         await getPinContextMenuItems(webviewView)
         await clickPinContextMenuItem(webviewView, '@workspace')
     })
+    it('Pin Context Test Folders', async () => {
+        await clickPinContextButton(webviewView)
+        await getPinContextMenuItems(webviewView)
+        await clickPinContextMenuItem(webviewView, 'Folders')
+    })
+    it('Pin Context Test Files', async () => {
+        await clickPinContextButton(webviewView)
+        await getPinContextMenuItems(webviewView)
+        await clickPinContextMenuItem(webviewView, 'Files')
+    })
+    it('Pin Context Test Code', async () => {
+        await clickPinContextButton(webviewView)
+        await getPinContextMenuItems(webviewView)
+        await clickPinContextMenuItem(webviewView, 'Code')
+    })
+    it('Pin Context Test Prompts', async () => {
+        await clickPinContextButton(webviewView)
+        await getPinContextMenuItems(webviewView)
+        await clickPinContextMenuItem(webviewView, 'Prompts')
+    })
+    it('Pin Context Test Image', async () => {
+        await clickPinContextButton(webviewView)
+        await getPinContextMenuItems(webviewView)
+        await clickPinContextMenuItem(webviewView, 'Image')
+    })
 })
diff --git a/packages/amazonq/test/e2e_new/amazonq/tests/quickActions.test.ts b/packages/amazonq/test/e2e_new/amazonq/tests/quickActions.test.ts
index e27fe447d24..73fd6733c20 100644
--- a/packages/amazonq/test/e2e_new/amazonq/tests/quickActions.test.ts
+++ b/packages/amazonq/test/e2e_new/amazonq/tests/quickActions.test.ts
@@ -11,7 +11,7 @@ import { clearChat } from '../utils/generalUtils'
 
 describe('Amazon Q Chat Quick Actions Functionality', function () {
     // this timeout is the general timeout for the entire test suite
-    this.timeout(150000)
+    this.timeout(50000)
     let webviewView: WebviewView
 
     before(async function () {
@@ -31,4 +31,32 @@ describe('Amazon Q Chat Quick Actions Functionality', function () {
     it('Quick Actions Test', async () => {
         await clickQuickActionsCommand(webviewView, 'dev')
     })
+
+    it('Quick Actions Test', async () => {
+        await clickQuickActionsCommand(webviewView, 'test')
+    })
+
+    it('Quick Actions Test', async () => {
+        await clickQuickActionsCommand(webviewView, 'review')
+    })
+
+    it('Quick Actions Test', async () => {
+        await clickQuickActionsCommand(webviewView, 'doc')
+    })
+
+    it('Quick Actions Test', async () => {
+        await clickQuickActionsCommand(webviewView, 'transform')
+    })
+
+    it('Quick Actions Test', async () => {
+        await clickQuickActionsCommand(webviewView, 'help')
+    })
+
+    it('Quick Actions Test', async () => {
+        await clickQuickActionsCommand(webviewView, 'clear')
+    })
+
+    it('Quick Actions Test', async () => {
+        await clickQuickActionsCommand(webviewView, 'compact')
+    })
 })
diff --git a/packages/amazonq/test/e2e_new/amazonq/tests/switchModel.test.ts b/packages/amazonq/test/e2e_new/amazonq/tests/switchModel.test.ts
index 41cbbf0aec5..5faf08b00fa 100644
--- a/packages/amazonq/test/e2e_new/amazonq/tests/switchModel.test.ts
+++ b/packages/amazonq/test/e2e_new/amazonq/tests/switchModel.test.ts
@@ -10,7 +10,7 @@ import { closeAllTabs } from '../utils/cleanupUtils'
 
 describe('Amazon Q Switch Model Functionality', function () {
     // this timeout is the general timeout for the entire test suite
-    this.timeout(150000)
+    this.timeout(50000)
     let webviewView: WebviewView
 
     before(async function () {
@@ -25,4 +25,9 @@ describe('Amazon Q Switch Model Functionality', function () {
         await listModels(webviewView)
         await selectModel(webviewView, 'Claude Sonnet 3.7')
     })
+
+    it('Switch Model Test', async () => {
+        await listModels(webviewView)
+        await selectModel(webviewView, 'Claude Sonnet 4')
+    })
 })
diff --git a/packages/amazonq/test/e2e_new/amazonq/utils/authUtils.ts b/packages/amazonq/test/e2e_new/amazonq/utils/authUtils.ts
index 226288be667..fadf680fecc 100644
--- a/packages/amazonq/test/e2e_new/amazonq/utils/authUtils.ts
+++ b/packages/amazonq/test/e2e_new/amazonq/utils/authUtils.ts
@@ -43,7 +43,7 @@ export async function signInToAmazonQ(): Promise<void> {
     await UrlContinue.click()
 
     console.log('Waiting for manual authentication...')
-    await sleep(12000)
+    await sleep(20000)
     console.log('Manual authentication should be done')
     await webviewView.switchBack()
 
@@ -60,4 +60,12 @@ export async function signInToAmazonQ(): Promise<void> {
 you've already logged in before. */
 export async function signOutFromAmazonQ(workbench: Workbench): Promise<void> {
     await workbench.executeCommand('Amazon Q: Sign Out')
+    const webviewView = new WebviewView()
+    await webviewView.switchToFrame()
+
+    // const moreOptionButton = await webviewView.findWebElement(By.css('#action-label codicon codicon-toolbar-more'))
+    // await moreOptionButton.click()
+
+    // const moreOptionButton = await webviewView.findWebElement(By.css('#action-label codicon codicon-toolbar-more'))
+    // await moreOptionButton.click()
 }