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.

Sign up for GitHub

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: remove waitAndClick from positron test code #5748

Merged
merged 2 commits into from
Dec 16, 2024
Merged

E2E tests: remove waitAndClick from positron test code #5748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a36b94
E2E tests: remove waitAndClick from positron test code
testlabauto Dec 16, 2024
b38737c
compile error
testlabauto Dec 16, 2024
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
2 changes: 1 addition & 1 deletion test/automation/src/positron/positronBaseElement.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export class PositronBaseElement {
}

async click(): Promise<void> {
await this.code.waitAndClick(this.myselector);
await this.code.driver.page.locator(this.myselector).click();
}

async isNotVisible(retryCount: number = 200): Promise<void> {
Expand Down
2 changes: 1 addition & 1 deletion test/automation/src/positron/positronConsole.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ export class PositronConsole {
}

async maximizeConsole() {
await this.code.waitAndClick(MAXIMIZE_CONSOLE);
await this.code.driver.page.locator(MAXIMIZE_CONSOLE).click();
}

async pasteCodeToConsole(code: string) {
Expand Down
18 changes: 9 additions & 9 deletions test/automation/src/positron/positronDataExplorer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,31 +93,31 @@ export class PositronDataExplorer {
}

async closeDataExplorer() {
await this.code.waitAndClick(CLOSE_DATA_EXPLORER);
await this.code.driver.page.locator(CLOSE_DATA_EXPLORER).first().click();
}

async clickLowerRightCorner() {
await this.code.waitAndClick(SCROLLBAR_LOWER_RIGHT_CORNER);
await this.code.driver.page.locator(SCROLLBAR_LOWER_RIGHT_CORNER).click();
}

async clickUpperLeftCorner() {
await this.code.waitAndClick(DATA_GRID_TOP_LEFT);
await this.code.driver.page.locator(DATA_GRID_TOP_LEFT).click();
}

/*
* Add a filter to the data explorer. Only works for a single filter at the moment.
*/
async addFilter(columnName: string, functionText: string, filterValue: string) {

await this.code.waitAndClick(ADD_FILTER_BUTTON);
await this.code.driver.page.locator(ADD_FILTER_BUTTON).click();

// worakaround for column being set incorrectly
await expect(async () => {
try {
await this.code.waitAndClick(COLUMN_SELECTOR);
await this.code.driver.page.locator(COLUMN_SELECTOR).click();
const columnText = `${columnName}\n`;
await this.code.waitForSetValue(COLUMN_INPUT, columnText);
await this.code.waitAndClick(COLUMN_SELECTOR_CELL);
await this.code.driver.page.locator(COLUMN_SELECTOR_CELL).click();
const checkValue = (await this.code.waitForElement(COLUMN_SELECTOR)).textContent;
expect(checkValue).toBe(columnName);
} catch (e) {
Expand All @@ -127,7 +127,7 @@ export class PositronDataExplorer {
}).toPass({ timeout: 30000 });


await this.code.waitAndClick(FUNCTION_SELECTOR);
await this.code.driver.page.locator(FUNCTION_SELECTOR).click();

// note that base Microsoft funtionality does not work with "has text" type selection
const equalTo = this.code.driver.getLocator(`${OVERLAY_BUTTON} div:has-text("${functionText}")`);
Expand All @@ -136,7 +136,7 @@ export class PositronDataExplorer {
const filterValueText = `${filterValue}\n`;
await this.code.waitForSetValue(FILTER_SELECTOR, filterValueText);

await this.code.waitAndClick(APPLY_FILTER);
await this.code.driver.page.locator(APPLY_FILTER).click();
}

async getDataExplorerStatusBar() {
Expand All @@ -145,7 +145,7 @@ export class PositronDataExplorer {

async selectColumnMenuItem(columnIndex: number, menuItem: string) {

await this.code.waitAndClick(`.data-grid-column-header:nth-child(${columnIndex}) .sort-button`);
await this.code.driver.page.locator(`.data-grid-column-header:nth-child(${columnIndex}) .sort-button`).click();

await this.code.driver.getLocator(`.positron-modal-overlay div.title:has-text("${menuItem}")`).click();

Expand Down
7 changes: 6 additions & 1 deletion test/automation/src/positron/positronNewProjectWizard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,13 @@ export class PositronNewProjectWizard {
class ProjectWizardProjectTypeStep {
constructor(private code: Code) { }

cssEscape(value: string): string {
return value.replace(/[\s!"#$%&'()*+,./:;<=>?@[\\\]^`{|}~]/g, '\\$&');
}

async selectProjectType(projectType: ProjectType) {
await this.code.waitAndClick(`input[id="${projectType}"]`);
const locator = this.code.driver.page.locator('label').filter({hasText: projectType});
await locator.click({ force: true });
}
}

Expand Down
6 changes: 3 additions & 3 deletions test/automation/src/positron/positronPopups.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export class PositronPopups {
this.code.logger.log('Checking for modal dialog box');
// fail fast if the modal is not present
await this.code.waitForElement(POSITRON_MODAL_DIALOG_BOX, undefined, 50);
await this.code.waitAndClick(POSITRON_MODAL_DIALOG_BOX_OK);
await this.code.driver.page.locator(POSITRON_MODAL_DIALOG_BOX_OK).click();
this.code.logger.log('Installing ipykernel');
await this.waitForToastToAppear();
await this.waitForToastToDisappear();
Expand Down Expand Up @@ -68,11 +68,11 @@ export class PositronPopups {
);
if (install) {
this.code.logger.log('Installing Renv');
await this.code.waitAndClick(POSITRON_MODAL_DIALOG_BOX_OK);
await this.code.driver.page.locator(POSITRON_MODAL_DIALOG_BOX_OK).click();
this.code.logger.log('Installed Renv');
} else {
this.code.logger.log('Skipping Renv installation');
await this.code.waitAndClick(POSITRON_MODAL_DIALOG_BOX_CANCEL);
await this.code.driver.page.locator(POSITRON_MODAL_DIALOG_BOX_CANCEL).click();
}
} catch {
this.code.logger.log('Did not find install Renv modal dialog box');
Expand Down
2 changes: 1 addition & 1 deletion test/automation/src/positron/positronSideBar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ export class PositronSideBar {

async closeSecondarySideBar() {
this.code.logger.log('Hiding secondary side bar');
await this.code.waitAndClick(HIDE_SECONDARY_SIDE_BAR);
await this.code.driver.page.locator(HIDE_SECONDARY_SIDE_BAR).click();
}
}
7 changes: 3 additions & 4 deletions test/automation/src/positron/positronTestExplorer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ import { PositronExplorer } from './positronExplorer';
const TEST_RESULT_ITEM = '.monaco-list-row[aria-level="2"] .test-peek-item';
const NAME = '.name';
const COMPUTED_STATE = '.computed-state';
const TEST_EXPLORER_ICON = '.codicon-test-view-icon';
const RUN_ALL = '.codicon-testing-run-all-icon';
const TEST_EXPLORER_ICON = '.composite-bar .codicon-test-view-icon';

/*
* Reuseable Positron test explorer functionality for tests to leverage.
Expand Down Expand Up @@ -52,7 +51,7 @@ export class PositronTestExplorer extends PositronExplorer {
* @returns Promise<void>
*/
async clickTestExplorerIcon(): Promise<void> {
await this.code.waitAndClick(TEST_EXPLORER_ICON);
await this.code.driver.page.locator(TEST_EXPLORER_ICON).click();
}

/**
Expand All @@ -68,6 +67,6 @@ export class PositronTestExplorer extends PositronExplorer {
* @returns Promise<void>
*/
async runAllTests(): Promise<void> {
await this.code.waitAndClick(RUN_ALL);
await this.code.driver.page.getByLabel('Testing actions').getByLabel('Run Tests').click();
}
}
22 changes: 12 additions & 10 deletions test/e2e/features/plots/plots.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,19 +376,21 @@ async function compareImages({
testInfo: any;
}) {
await test.step('compare images', async () => {
const data = await resembleCompareImages(fs.readFileSync(path.join(__dirname, `${masterScreenshotName}.png`),), buffer, options);
if (process.env.GITHUB_ACTIONS && !app.web) {
const data = await resembleCompareImages(fs.readFileSync(path.join(__dirname, `${masterScreenshotName}.png`),), buffer, options);

if (process.env.GITHUB_ACTIONS && !app.web && data.rawMisMatchPercentage > 2.0) {
if (data.getBuffer) {
await testInfo.attach(diffScreenshotName, { body: data.getBuffer(true), contentType: 'image/png' });
}
if (data.rawMisMatchPercentage > 2.0) {
if (data.getBuffer) {
await testInfo.attach(diffScreenshotName, { body: data.getBuffer(true), contentType: 'image/png' });
}

// Capture a new master image in CI
const newMaster = await app.workbench.positronPlots.currentPlot.screenshot();
await testInfo.attach(masterScreenshotName, { body: newMaster, contentType: 'image/png' });
// Capture a new master image in CI
const newMaster = await app.workbench.positronPlots.currentPlot.screenshot();
await testInfo.attach(masterScreenshotName, { body: newMaster, contentType: 'image/png' });

// Fail the test with mismatch details
fail(`Image comparison failed with mismatch percentage: ${data.rawMisMatchPercentage}`);
// Fail the test with mismatch details
fail(`Image comparison failed with mismatch percentage: ${data.rawMisMatchPercentage}`);
}
}
});
}
Expand Down
Loading