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

Jonv-more-windows-tests #5719

Merged
merged 11 commits into from
Dec 13, 2024
Merged

Jonv-more-windows-tests #5719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
24eb5ae
added layout tests
jonvanausdeln Dec 10, 2024
f11abc6
turn on r new-project tests
jonvanausdeln Dec 10, 2024
9ad8dc3
turn on Python new project tests
jonvanausdeln Dec 10, 2024
9a031c2
increased timeout
jonvanausdeln Dec 11, 2024
50eb57c
Bumped timout for all python new project tests
jonvanausdeln Dec 11, 2024
9d14a61
fixed timeout
jonvanausdeln Dec 12, 2024
f716337
Merge branch 'main' into jonv-more-windows-tests
jonvanausdeln Dec 12, 2024
fca1043
added comment
jonvanausdeln Dec 12, 2024
5d43998
turned on more shiny, console , data-explorer, edotor, and help tests
jonvanausdeln Dec 12, 2024
dd1ba32
adjusted help tests that run
jonvanausdeln Dec 12, 2024
86cce16
added large notebook test
jonvanausdeln Dec 12, 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/e2e/features/apps/shiny.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ test.use({
suiteId: __filename
});

test.describe('Shiny Application', { tag: [tags.APPS, tags.VIEWER] }, () => {
test.describe('Shiny Application', { tag: [tags.APPS, tags.VIEWER, tags.WIN] }, () => {
test.beforeAll(async function ({ app }) {
try {
await app.workbench.extensions.installExtension('posit.shiny', true);
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/features/console/console-ansi.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ test.use({
suiteId: __filename
});

test.describe('Console ANSI styling', { tag: [tags.CRITICAL, tags.CONSOLE] }, () => {
test.describe('Console ANSI styling', { tag: [tags.CRITICAL, tags.CONSOLE, tags.WIN] }, () => {
test.beforeEach(async function ({ app }) {
await app.workbench.positronLayouts.enterLayout('fullSizedPanel');
});
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/features/console/console-clipboard.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ test.use({
suiteId: __filename
});

test.describe('Console - Clipboard', { tag: [tags.CONSOLE] }, () => {
test.describe('Console - Clipboard', { tag: [tags.CONSOLE, tags.WIN] }, () => {
test('Python - Copy from console & paste to console [C608100]', async function ({ app, python }) {
await testBody(app);
});
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/features/data-explorer/data-explorer-headless.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ test.use({
});

test.describe('Headless Data Explorer - Large Data Frame', {
tag: [tags.WEB, tags.DATA_EXPLORER, tags.DUCK_DB]
tag: [tags.WEB, tags.DATA_EXPLORER, tags.DUCK_DB, tags.WIN]
}, () => {
// python fixture not actually needed but serves as a long wait so that we can be sure
// headless/duckdb open will work
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/features/editor/fast-execution.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ test.use({

const FILENAME = 'fast-execution.r';

test.describe('R Fast Execution', { tag: [tags.WEB, tags.EDITOR] }, () => {
test.describe('R Fast Execution', { tag: [tags.WEB, tags.EDITOR, tags.WIN] }, () => {
test('Verify fast execution is not out of order [C712539]', async function ({ app, r }) {
await app.workbench.quickaccess.openFile(join(app.workspacePathOrFolder, 'workspaces', 'fast-statement-execution', FILENAME));

Expand Down
6 changes: 3 additions & 3 deletions test/e2e/features/help/help.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ test.use({

test.describe('Help', { tag: [tags.HELP] }, () => {

test('Python - Verifies basic help functionality [C633814]', async function ({ app, python }) {
test('Python - Verifies basic help functionality [C633814]', { tag: [tags.WIN] }, async function ({ app, python }) {
await app.workbench.positronConsole.executeCode('Python', `?load`, '>>>');

await expect(async () => {
Expand All @@ -21,7 +21,7 @@ test.describe('Help', { tag: [tags.HELP] }, () => {

});

test('R - Verifies basic help functionality [C633813]', async function ({ app, r }) {
test('R - Verifies basic help functionality [C633813]', { tag: [tags.WIN] }, async function ({ app, r }) {
await app.workbench.positronConsole.executeCode('R', `?load()`, '>');

await expect(async () => {
Expand All @@ -32,7 +32,7 @@ test.describe('Help', { tag: [tags.HELP] }, () => {
});

test('Verifies help panel can be opened when empty and also can be resized smaller and remember resize height [C640934]', async function ({ app, logger }) {

// Not running on windows as the size calculation is off for the resolution in CI
const positronHelp = app.workbench.positronHelp;
const helpContainerLocator = positronHelp.getHelpContainer();
const helpPanelHeaderLocator = positronHelp.getHelpHeader();
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/features/layouts/layouts.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ test.use({
suiteId: __filename
});

test.describe('Layouts', { tag: [tags.WEB, tags.LAYOUTS] }, () => {
test.describe('Layouts', { tag: [tags.WEB, tags.LAYOUTS, tags.WIN] }, () => {

test.describe('Stacked Layout', () => {

Expand Down
20 changes: 8 additions & 12 deletions test/e2e/features/new-project-wizard/new-project-python.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ test.beforeEach(async function ({ app }) {
await app.workbench.positronConsole.waitForReadyOrNoInterpreter();
});

// Not running conda test on windows becuase conda reeks havoc on selecting the correct python interpreter
test.describe('Python - New Project Wizard', { tag: [tags.NEW_PROJECT_WIZARD] }, () => {
const defaultProjectName = 'my-python-project';

Expand Down Expand Up @@ -43,7 +44,7 @@ test.describe('Python - New Project Wizard', { tag: [tags.NEW_PROJECT_WIZARD] },
await app.workbench.quickaccess.runCommand('workbench.action.toggleAuxiliaryBar');
});

test('Create a new Venv environment [C627912]', { tag: [tags.CRITICAL] }, async function ({ app, page }) {
test('Create a new Venv environment [C627912]', { tag: [tags.CRITICAL, tags.WIN] }, async function ({ app, page }) {
// This is the default behavior for a new Python Project in the Project Wizard
const projSuffix = addRandomNumSuffix('_new_venv');
const pw = app.workbench.positronNewProjectWizard;
Expand All @@ -54,15 +55,13 @@ test.describe('Python - New Project Wizard', { tag: [tags.NEW_PROJECT_WIZARD] },
await pw.navigate(ProjectWizardNavigateAction.CREATE);
await pw.currentOrNewWindowSelectionModal.currentWindowButton.click();
await expect(page.getByRole('button', { name: `Explorer Section: ${defaultProjectName + projSuffix}` })).toBeVisible({ timeout: 20000 });
await expect(app.workbench.positronConsole.activeConsole.getByText('>>>')).toBeVisible({ timeout: 45000 });
await expect(app.workbench.positronConsole.activeConsole.getByText('>>>')).toBeVisible({ timeout: 100000 });
await app.workbench.quickaccess.runCommand('workbench.action.toggleAuxiliaryBar');
await app.workbench.positronConsole.barClearButton.click();
await app.workbench.quickaccess.runCommand('workbench.action.toggleAuxiliaryBar');
});

test.skip('With ipykernel already installed [C609619]', {
annotation: [{ type: 'issue', description: 'https://github.com/posit-dev/positron/issues/5286' }]
}, async function ({ app, page, python }) {
test('With ipykernel already installed [C609619]', { tag: [tags.WIN] }, async function ({ app, page, python }) {
const projSuffix = addRandomNumSuffix('_ipykernelInstalled');
const pw = app.workbench.positronNewProjectWizard;
const pythonFixtures = new PositronPythonFixtures(app);
Expand Down Expand Up @@ -94,12 +93,10 @@ test.describe('Python - New Project Wizard', { tag: [tags.NEW_PROJECT_WIZARD] },
await pw.navigate(ProjectWizardNavigateAction.CREATE);
await pw.currentOrNewWindowSelectionModal.currentWindowButton.click();
await expect(page.getByRole('button', { name: `Explorer Section: ${defaultProjectName + projSuffix}` })).toBeVisible({ timeout: 20000 });
await expect(app.workbench.positronConsole.activeConsole.getByText('>>>')).toBeVisible({ timeout: 45000 });
await expect(app.workbench.positronConsole.activeConsole.getByText('>>>')).toBeVisible({ timeout: 90000 });
});

test.skip('With ipykernel not already installed [C609617]', {
annotation: [{ type: 'issue', description: 'https://github.com/posit-dev/positron/issues/5286' }]
}, async function ({ app, page }) {
test('With ipykernel not already installed [C609617]', { tag: [tags.WIN] }, async function ({ app, page }) {
const projSuffix = addRandomNumSuffix('_noIpykernel');
const pw = app.workbench.positronNewProjectWizard;
const pythonFixtures = new PositronPythonFixtures(app);
Expand Down Expand Up @@ -143,7 +140,7 @@ test.describe('Python - New Project Wizard', { tag: [tags.NEW_PROJECT_WIZARD] },

// If ipykernel was successfully installed during the new project initialization,
// the console should be ready without any prompts to install ipykernel
await expect(app.workbench.positronConsole.activeConsole.getByText('>>>')).toBeVisible({ timeout: 45000 });
await expect(app.workbench.positronConsole.activeConsole.getByText('>>>')).toBeVisible({ timeout: 90000 });
await app.workbench.quickaccess.runCommand('workbench.action.toggleAuxiliaryBar');
await app.workbench.positronConsole.barClearButton.click();
await app.workbench.quickaccess.runCommand('workbench.action.toggleAuxiliaryBar');
Expand All @@ -165,7 +162,7 @@ test.describe('Python - New Project Wizard', { tag: [tags.NEW_PROJECT_WIZARD] },
// Open the new project in the current window and wait for the console to be ready
await pw.currentOrNewWindowSelectionModal.currentWindowButton.click();
await expect(page.getByRole('button', { name: `Explorer Section: ${defaultProjectName + projSuffix}` })).toBeVisible({ timeout: 20000 });
await expect(app.workbench.positronConsole.activeConsole.getByText('>>>')).toBeVisible({ timeout: 45000 });
await expect(app.workbench.positronConsole.activeConsole.getByText('>>>')).toBeVisible({ timeout: 90000 });

// Verify git-related files are present
await expect(async () => {
Expand All @@ -186,4 +183,3 @@ test.describe('Python - New Project Wizard', { tag: [tags.NEW_PROJECT_WIZARD] },
function addRandomNumSuffix(name: string): string {
return `${name}_${Math.floor(Math.random() * 1000000)}`;
}

8 changes: 4 additions & 4 deletions test/e2e/features/new-project-wizard/new-project-r-jupyter.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ test.describe('R - New Project Wizard', { tag: [tags.NEW_PROJECT_WIZARD] }, () =
// here, but it's timing out in CI, so it is not included for now.
});

test('R - Accept Renv install [C633084]', async function ({ app, r }) {
test('R - Accept Renv install [C633084]', { tag: [tags.WIN] }, async function ({ app, r }) {
const projSuffix = addRandomNumSuffix('_installRenv');
const pw = app.workbench.positronNewProjectWizard;
// Create a new R project - select Renv and install
Expand Down Expand Up @@ -78,7 +78,7 @@ test.describe('R - New Project Wizard', { tag: [tags.NEW_PROJECT_WIZARD] }, () =
);
});

test('R - Renv already installed [C656251]', async function ({ app }) {
test('R - Renv already installed [C656251]', { tag: [tags.WIN] }, async function ({ app }) {
// Renv will already be installed from the previous test - which is why tests are marked as "serial"
const projSuffix = addRandomNumSuffix('_renvAlreadyInstalled');
const pw = app.workbench.positronNewProjectWizard;
Expand All @@ -104,7 +104,7 @@ test.describe('R - New Project Wizard', { tag: [tags.NEW_PROJECT_WIZARD] }, () =
);
});

test('R - Cancel Renv install [C656252]', async function ({ app }) {
test('R - Cancel Renv install [C656252]', { tag: [tags.WIN] }, async function ({ app }) {
const projSuffix = addRandomNumSuffix('_cancelRenvInstall');
const pw = app.workbench.positronNewProjectWizard;
// Remove renv package so we are prompted to install it again
Expand Down Expand Up @@ -138,7 +138,7 @@ test.describe('R - New Project Wizard', { tag: [tags.NEW_PROJECT_WIZARD] }, () =
test.describe('Jupyter - New Project Wizard', () => {
const defaultProjectName = 'my-jupyter-notebook';

test('Jupyter Project Defaults [C629352]', { tag: [tags.CRITICAL] }, async function ({ app }) {
test('Jupyter Project Defaults [C629352]', { tag: [tags.CRITICAL, tags.WIN] }, async function ({ app }) {
const projSuffix = addRandomNumSuffix('_defaults');
const pw = app.workbench.positronNewProjectWizard;
await pw.startNewProject(ProjectType.JUPYTER_NOTEBOOK);
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/features/notebook/notebook-large-python.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ test.use({

// Note that this test is too heavy to pass on web and windows
test.describe('Large Python Notebook', {
tag: [tags.NOTEBOOK]
tag: [tags.NOTEBOOK, tags.WIN]
}, () => {

test('Python - Large notebook execution [C983592]', async function ({ app, python }) {
Expand Down
Loading