reverting changes

Author: laura-codess

packages/amazonq/test/e2e_new/amazonq/backslash.test.ts

@@ -4,7 +4,7 @@
  */
 import './utils/setup'
 import { WebviewView } from 'vscode-extension-tester'
-import { dismissOverlayIfPresent } from './framework/cleanupHelper'
+import { closeAllTabs, dismissOverlayIfPresent } from './framework/cleanupHelper'
 import { testContext } from './utils/testContext'
 import { clickBackslashCommand } from './framework/backslashHelper'
 import { clearChat } from './framework/chatHelper'
@@ -18,6 +18,10 @@ describe('Amazon Q Chat Backslash Functionality', function () {
         webviewView = testContext.webviewView!
     })
 
+    after(async function () {
+        await closeAllTabs(webviewView)
+    })
+
     afterEach(async () => {
         // before closing the tabs, make sure that any overlays have been dismissed
         await dismissOverlayIfPresent(webviewView)

packages/amazonq/test/e2e_new/amazonq/switchModel.test.ts

@@ -6,6 +6,7 @@ import './utils/setup'
 import { WebviewView } from 'vscode-extension-tester'
 import { testContext } from './utils/testContext'
 import { listModels, selectModel } from './framework/switchModelHelper'
+import { closeAllTabs } from './framework/cleanupHelper'
 
 describe('Amazon Q Switch Model Functionality', function () {
     // this timeout is the general timeout for the entire test suite
@@ -16,6 +17,10 @@ describe('Amazon Q Switch Model Functionality', function () {
         webviewView = testContext.webviewView!
     })
 
+    after(async function () {
+        await closeAllTabs(webviewView)
+    })
+
     it('Switch Model Test', async () => {
         await listModels(webviewView)
         await selectModel(webviewView, 'Claude Sonnet 3.7')

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

@@ -3,8 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { signInToAmazonQ } from '../framework/authHelper'
-import { closeAllTabs } from '../framework/cleanupHelper'
-import { testContext } from './testContext'
 
 before(async function () {
     this.timeout(60000)
@@ -13,11 +11,3 @@ before(async function () {
     console.log('You have 60 seconds to complete this step\n\n')
     await signInToAmazonQ()
 })
-
-after(async function () {
-    this.timeout(30000)
-    console.log('\n\n*** GLOBAL CLEANUP ***')
-    console.log('Closing the chat tabs... \n\n')
-
-    await closeAllTabs(testContext.webviewView)
-})