Consolidated lifecycle hooks (DH-18428-2)

Author: bmingles

e2e-testing/src/specs/panels.spec.ts

@@ -7,7 +7,6 @@ import {
   setup,
   SIMPLE_TICKING3_PY,
   step,
-  teardown,
 } from '../util';
 
 const expectedTabs = {
@@ -55,10 +54,6 @@ describe('Panels Tests', () => {
     await new Workbench().executeCommand('View: Split Editor Down');
   });
 
-  after(async () => {
-    await teardown();
-  });
-
   it('should open panels', async () => {
     const editorView = new EditorViewExtended();
     const editor = await editorView.openTextEditor(SIMPLE_TICKING3_PY.name);

e2e-testing/src/specs/statusBar.spec.ts

@@ -10,7 +10,6 @@ import {
   SIMPLE_TICKING3_PY,
   SIMPLE_TICKING_MD,
   step,
-  teardown,
   TEST_GROOVY,
   TEST_TXT,
 } from '../util';
@@ -34,10 +33,6 @@ describe('Status Bar Tests', () => {
     statusBar = new StatusBar();
   });
 
-  after(async () => {
-    await teardown();
-  });
-
   it('should only show Deephaven status bar item for supported file types', async () => {
     for (const [s, fileName, isVisible] of [
       [1, TEST_TXT.name, false],

e2e-testing/src/util/lifeCycle.ts

@@ -6,16 +6,10 @@ import { SERVER_TITLE } from './constants';
  * Setup before running test suite.
  */
 export async function setup(): Promise<void> {
-  const explorer = await new ActivityBar().getViewControl('Explorer');
-  await explorer?.openView();
-}
-
-/**
- * Teardown after running test suite.
- */
-export async function teardown(): Promise<void> {
+  // Ensure we have a clean slate from any previous test suites
   await new EditorView().closeAllEditors();
   await disconnectFromServer(SERVER_TITLE);
+
   const explorer = await new ActivityBar().getViewControl('Explorer');
   await explorer?.openView();
 }