Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

E2E tests: deprecate positron base element #5790

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion test/automation/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
57 changes: 0 additions & 57 deletions test/automation/src/positron/positronBaseElement.ts

This file was deleted.

7 changes: 3 additions & 4 deletions test/automation/src/positron/positronDataExplorer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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);
}

/*
Expand Down
10 changes: 3 additions & 7 deletions test/automation/src/positron/positronExplorer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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"]';
Expand All @@ -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.
Expand Down
14 changes: 7 additions & 7 deletions test/automation/src/positron/positronTopActionBar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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"]';
Expand All @@ -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);
}
}
Loading