E2E test: cleanup test files (#7144)

Cleanup of test files, including undoing github actions using a new
fixture called `cleanup`.

### QA Notes

@:web @:win @:plots @:notebooks @:scm @:top-action-bar

Author: testlabauto

test/e2e/infra/index.ts

@@ -9,6 +9,7 @@ export * from './logger';
 export * from './workbench';
 export * from './keyboard';
 export * from './test-runner';
+export * from './test-teardown.js';
 
 // pages
 export * from '../pages/console';

test/e2e/infra/test-teardown.ts

@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (C) 2025 Posit Software, PBC. All rights reserved.
+ *  Licensed under the Elastic License 2.0. See LICENSE.txt for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as fs from 'fs';
+import { execSync } from 'child_process';
+
+export class TestTeardown {
+
+	constructor(private _workspacePathOrFolder: string) { }
+
+	async removeTestFiles(files: string[]): Promise<void> {
+		for (const file of files) {
+			const filePath = this._workspacePathOrFolder + '/' + file;
+			if (fs.existsSync(filePath)) {
+				fs.rmSync(filePath, { recursive: true, force: true });
+			}
+		}
+	}
+
+	async removeTestFolder(folder: string): Promise<void> {
+		const folderPath = this._workspacePathOrFolder + '/' + folder;
+		if (fs.existsSync(folderPath)) {
+			fs.rmSync(folderPath, { recursive: true, force: true });
+		}
+	}
+
+	async discardAllChanges(): Promise<void> {
+		try {
+			execSync('git reset --hard $(git rev-list --max-parents=0 HEAD)', { cwd: this._workspacePathOrFolder });
+			execSync('git clean -fd', { cwd: this._workspacePathOrFolder });
+		} catch (error) {
+			console.error('Failed to discard changes:', error);
+		}
+	}
+}

test/e2e/tests/_test.setup.ts

@@ -21,7 +21,7 @@ import { randomUUID } from 'crypto';
 import archiver from 'archiver';
 
 // Local imports
-import { Application, Logger, UserSetting, UserSettingsFixtures, createLogger, createApp, TestTags, Sessions, HotKeys } from '../infra';
+import { Application, Logger, UserSetting, UserSettingsFixtures, createLogger, createApp, TestTags, Sessions, HotKeys, TestTeardown } from '../infra';
 import { PackageManager } from '../pages/utils/packageManager';
 
 // Constants
@@ -361,6 +361,11 @@ export const test = base.extend<TestFixtures & CurrentsFixtures, WorkerFixtures
 		logger.log(endLog);
 		logger.log('');
 	}, { scope: 'test', auto: true }],
+
+	cleanup: async ({ app }, use) => {
+		const cleanup = new TestTeardown(app.workspacePathOrFolder);
+		await use(cleanup);
+	},
 });
 
 // Runs once per worker. If a worker handles multiple specs, these hooks only run for the first spec.
@@ -439,6 +444,7 @@ interface TestFixtures {
 	runCommand: (command: string, options?: { keepOpen?: boolean; exactMatch?: boolean }) => Promise<void>;
 	executeCode: (language: 'Python' | 'R', code: string) => Promise<void>;
 	hotKeys: HotKeys;
+	cleanup: TestTeardown;
 }
 
 interface WorkerFixtures {

test/e2e/tests/notebook/notebook-create.test.ts

@@ -11,6 +11,8 @@ test.use({
 	suiteId: __filename
 });
 
+let newFileName: string;
+
 test.describe('Notebooks', {
 	tag: [tags.CRITICAL, tags.WEB, tags.WIN, tags.NOTEBOOKS]
 }, () => {
@@ -31,6 +33,10 @@ test.describe('Notebooks', {
 			await app.workbench.notebooks.closeNotebookWithoutSaving();
 		});
 
+		test.afterAll(async function ({ cleanup }) {
+			await cleanup.removeTestFiles([newFileName]);
+		});
+
 		test('Python - Verify code cell execution in notebook', async function ({ app }) {
 			await app.workbench.notebooks.addCodeToCellAtIndex('eval("8**2")');
 			await app.workbench.notebooks.executeCodeInCell();
@@ -68,7 +74,7 @@ test.describe('Notebooks', {
 			await app.workbench.quickaccess.runCommand('workbench.action.files.saveAs', { keepOpen: true });
 			await app.workbench.quickInput.waitForQuickInputOpened();
 			// Generate a random filename
-			const newFileName = `saved-session-test-${Math.random().toString(36).substring(7)}.ipynb`;
+			newFileName = `saved-session-test-${Math.random().toString(36).substring(7)}.ipynb`;
 
 			await app.workbench.quickInput.type(path.join(app.workspacePathOrFolder, newFileName));
 			await app.workbench.quickInput.clickOkButton();

test/e2e/tests/plots/plots.test.ts

@@ -30,6 +30,10 @@ test.describe('Plots', { tag: [tags.PLOTS, tags.EDITOR] }, () => {
 			await app.workbench.plots.waitForNoPlots();
 		});
 
+		test.afterAll(async function ({ cleanup }) {
+			await cleanup.removeTestFiles(['Python-scatter.jpeg', 'Python-scatter-editor.jpeg']);
+		});
+
 		test('Python - Verify basic plot functionality - Dynamic Plot', {
 			tag: [tags.CRITICAL, tags.WEB, tags.WIN]
 		}, async function ({ app, logger, headless, logsPath }, testInfo) {
@@ -283,6 +287,10 @@ test.describe('Plots', { tag: [tags.PLOTS, tags.EDITOR] }, () => {
 			await app.workbench.plots.waitForNoPlots();
 		});
 
+		test.afterAll(async function ({ cleanup }) {
+			await cleanup.removeTestFiles(['r-cars.svg', 'r-cars.jpeg', 'plot.png']);
+		});
+
 		test('R - Verify basic plot functionality', {
 			tag: [tags.CRITICAL, tags.WEB, tags.WIN],
 			annotation: [{ type: 'issue', description: 'https://github.com/posit-dev/positron/issues/5954 (see comment)' }]

test/e2e/tests/scm/scm.test.ts

@@ -14,6 +14,10 @@ test.describe('Source Content Management', {
 	tag: [tags.SCM, tags.WEB, tags.WIN]
 }, () => {
 
+	test.afterAll(async function ({ cleanup }) {
+		await cleanup.discardAllChanges();
+	});
+
 	test('Verify SCM Tracks File Modifications, Staging, and Commit Actions', async function ({ app, openFile }) {
 
 		const file = 'chinook-sqlite.py';

test/e2e/tests/top-action-bar/top-action-bar-save.test.ts

@@ -20,6 +20,10 @@ test.describe('Top Action Bar - Save Actions', {
 		}
 	});
 
+	test.afterAll(async function ({ cleanup }) {
+		await cleanup.discardAllChanges();
+	});
+
 	test('Verify `Save` and `Save All` are disabled when no unsaved editors are open', async function ({ app }) {
 		await app.workbench.quickaccess.runCommand('workbench.action.closeAllEditors', { keepOpen: false });
 		await expect(app.workbench.topActionBar.saveButton).not.toBeEnabled();