E2E tests: deprecate positron base element

posit-dev · Dec 17, 2024 · 662be2c · 662be2c
1 parent 460beec
commit 662be2c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 76 deletions.
diff --git a/test/automation/src/index.ts b/test/automation/src/index.ts
@@ -37,7 +37,6 @@ export * from './positron/positronPlots';
 export * from './positron/fixtures/positronPythonFixtures';
 export * from './positron/fixtures/positronRFixtures';
 export * from './positron/fixtures/positronUserSettingsFixtures';
-export * from './positron/positronBaseElement';
 export * from './positron/positronNotebooks';
 export * from './positron/positronNewProjectWizard';
 export * from './positron/positronConnections';

diff --git a/test/automation/src/positron/positronBaseElement.ts b/test/automation/src/positron/positronBaseElement.ts
diff --git a/test/automation/src/positron/positronDataExplorer.ts b/test/automation/src/positron/positronDataExplorer.ts
@@ -4,9 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 
-import { expect } from '@playwright/test';
+import { expect, Locator } from '@playwright/test';
 import { Code } from '../code';
-import { PositronBaseElement } from './positronBaseElement';
 import { Workbench } from '../workbench';
 
 const COLUMN_HEADERS = '.data-explorer-panel .right-column .data-grid-column-headers';
@@ -48,10 +47,10 @@ export interface ColumnProfile {
  */
 export class PositronDataExplorer {
 
-	clearSortingButton: PositronBaseElement;
+	clearSortingButton: Locator;
 
 	constructor(private code: Code, private workbench: Workbench) {
-		this.clearSortingButton = new PositronBaseElement(CLEAR_SORTING_BUTTON, this.code);
+		this.clearSortingButton = this.code.driver.page.locator(CLEAR_SORTING_BUTTON);
 	}
 
 	/*

diff --git a/test/automation/src/positron/positronExplorer.ts b/test/automation/src/positron/positronExplorer.ts
@@ -4,10 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 
-import { expect } from '@playwright/test';
+import { expect, Locator } from '@playwright/test';
 import { Code } from '../code';
-// import { QuickAccess } from '../quickaccess';
-import { PositronTextElement } from './positronBaseElement';
 
 const POSITRON_EXPLORER_PROJECT_TITLE = 'div[id="workbench.view.explorer"] h3.title';
 const POSITRON_EXPLORER_PROJECT_FILES = 'div[id="workbench.view.explorer"] span[class="monaco-highlighted-label"]';
@@ -17,12 +15,10 @@ const POSITRON_EXPLORER_PROJECT_FILES = 'div[id="workbench.view.explorer"] span[
  *  Reuseable Positron explorer functionality for tests to leverage.
  */
 export class PositronExplorer {
-	explorerProjectTitle: PositronTextElement;
+	explorerProjectTitle: Locator = this.code.driver.page.locator(POSITRON_EXPLORER_PROJECT_TITLE);
 	explorerProjectTitleLocator = this.code.driver.page.locator(POSITRON_EXPLORER_PROJECT_TITLE);
 
-	constructor(protected code: Code) {
-		this.explorerProjectTitle = new PositronTextElement(POSITRON_EXPLORER_PROJECT_TITLE, this.code);
-	}
+	constructor(protected code: Code) { }
 
 	/**
 	 * Constructs a string array of the top-level project files/directories in the explorer.

diff --git a/test/automation/src/positron/positronTopActionBar.ts b/test/automation/src/positron/positronTopActionBar.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 
+import { Locator } from '@playwright/test';
 import { Code } from '../code';
-import { PositronBaseElement } from './positronBaseElement';
 
 const POSITRON_TOP_ACTION_BAR = 'div[id="workbench.parts.positron-top-action-bar"]';
 const POSITRON_TOP_ACTION_SAVE_BUTTON = 'div[id="workbench.parts.positron-top-action-bar"] .action-bar-region-left .action-bar-button[aria-label="Save"]';
@@ -15,13 +15,13 @@ const POSITRON_TOP_ACTION_SAVE_ALL_BUTTON = 'div[id="workbench.parts.positron-to
  *  Reuseable Positron top action bar functionality for tests to leverage.
  */
 export class PositronTopActionBar {
-	topActionBar: PositronBaseElement;
-	saveButton: PositronBaseElement;
-	saveAllButton: PositronBaseElement;
+	topActionBar: Locator;
+	saveButton: Locator;
+	saveAllButton: Locator;
 
 	constructor(private code: Code) {
-		this.topActionBar = new PositronBaseElement(POSITRON_TOP_ACTION_BAR, this.code);
-		this.saveButton = new PositronBaseElement(POSITRON_TOP_ACTION_SAVE_BUTTON, this.code);
-		this.saveAllButton = new PositronBaseElement(POSITRON_TOP_ACTION_SAVE_ALL_BUTTON, this.code);
+		this.topActionBar = this.code.driver.page.locator(POSITRON_TOP_ACTION_BAR);
+		this.saveButton = this.code.driver.page.locator(POSITRON_TOP_ACTION_SAVE_BUTTON);
+		this.saveAllButton = this.code.driver.page.locator(POSITRON_TOP_ACTION_SAVE_ALL_BUTTON);
 	}
 }