From 500c0b536f8d71857865f032a01772edcd390213 Mon Sep 17 00:00:00 2001
From: Christopher Mead <chrisrmead@comcast.net>
Date: Mon, 9 Dec 2024 10:01:02 -0700
Subject: [PATCH] E2E Tests: add area tags (#5666)

Just adding tags regarding areas to tests.

### QA Notes

All tests should pass.
---
 test/e2e/features/apps/python-apps.test.ts     |  2 +-
 test/e2e/features/apps/shiny.test.ts           |  3 +--
 .../connections/connections-db.test.ts         |  2 +-
 test/e2e/features/console/console-ansi.test.ts |  2 +-
 .../console/console-autocomplete.test.ts       |  2 +-
 .../features/console/console-clipboard.test.ts |  2 +-
 .../features/console/console-history.test.ts   |  2 +-
 .../e2e/features/console/console-input.test.ts |  2 +-
 .../features/console/console-output.test.ts    |  2 +-
 .../features/console/console-python.test.ts    |  2 +-
 test/e2e/features/console/console-r.test.ts    |  2 +-
 .../data-explorer/100x100-pandas.test.ts       |  2 +-
 .../data-explorer/100x100-polars.test.ts       |  2 +-
 .../features/data-explorer/100x100-r.test.ts   |  2 +-
 .../data-explorer-headless.test.ts             |  2 +-
 .../data-explorer-python-pandas.test.ts        |  2 +-
 .../data-explorer-python-polars.test.ts        |  2 +-
 .../data-explorer/data-explorer-r.test.ts      |  2 +-
 .../data-explorer/duckdb-sparklines.test.ts    |  2 +-
 .../data-explorer/large-data-frame.test.ts     |  2 +-
 .../features/data-explorer/sparklines.test.ts  |  2 +-
 .../very-large-data-frame.test.ts              |  2 +-
 .../data-explorer/xlsx-data-frame.test.ts      |  2 +-
 .../e2e/features/editor/fast-execution.test.ts |  2 +-
 test/e2e/features/help/f1.test.ts              |  2 +-
 test/e2e/features/help/help.test.ts            |  2 +-
 test/e2e/features/layouts/layouts.test.ts      |  2 +-
 .../new-project-python.test.ts                 |  2 +-
 .../new-project-r-jupyter.test.ts              |  2 +-
 .../features/notebook/notebook-create.test.ts  |  2 +-
 .../notebook/notebook-large-python.test.ts     |  4 +---
 test/e2e/features/outline/outline.test.ts      |  2 +-
 .../features/output/console-ouput-log.test.ts  |  2 +-
 test/e2e/features/plots/plots.test.ts          |  2 +-
 test/e2e/features/quarto/quarto.test.ts        |  2 +-
 .../e2e/features/r-markdown/r-markdown.test.ts |  2 +-
 .../r-pkg-development.test.ts                  |  2 +-
 .../e2e/features/reticulate/reticulate.test.ts |  2 +-
 .../test-explorer/test-explorer.test.ts        |  2 +-
 .../interpreter-dropdown.test.ts               |  2 +-
 .../top-action-bar/top-action-bar-save.test.ts |  2 +-
 .../variables/variables-expanded.test.ts       | 18 +++++++++---------
 .../variables/variables-notebook.test.ts       |  2 +-
 .../features/variables/variables-pane.test.ts  |  2 +-
 test/e2e/features/viewer/viewer.test.ts        |  2 +-
 test/e2e/features/welcome/welcome.test.ts      |  2 +-
 46 files changed, 54 insertions(+), 57 deletions(-)

diff --git a/test/e2e/features/apps/python-apps.test.ts b/test/e2e/features/apps/python-apps.test.ts
index bedbac93515..d24ae866b09 100644
--- a/test/e2e/features/apps/python-apps.test.ts
+++ b/test/e2e/features/apps/python-apps.test.ts
@@ -10,7 +10,7 @@ test.use({
 	suiteId: __filename
 });
 
-test.describe('Python Applications', { tag: ['@pr'] }, () => {
+test.describe('Python Applications', { tag: ['@pr', '@apps', '@viewer', '@editor'] }, () => {
 	test.afterEach(async function ({ app }) {
 		await app.workbench.quickaccess.runCommand('workbench.action.closeAllEditors');
 
diff --git a/test/e2e/features/apps/shiny.test.ts b/test/e2e/features/apps/shiny.test.ts
index 83f857a000c..6150934a375 100644
--- a/test/e2e/features/apps/shiny.test.ts
+++ b/test/e2e/features/apps/shiny.test.ts
@@ -10,8 +10,7 @@ test.use({
 	suiteId: __filename
 });
 
-test.describe('Shiny Application', {
-}, () => {
+test.describe('Shiny Application', { tag: ['@apps', '@viewer'] }, () => {
 	test.beforeAll(async function ({ app }) {
 		try {
 			await app.workbench.extensions.installExtension('posit.shiny', true);
diff --git a/test/e2e/features/connections/connections-db.test.ts b/test/e2e/features/connections/connections-db.test.ts
index 9982cca9abb..e31aa3e5c6c 100644
--- a/test/e2e/features/connections/connections-db.test.ts
+++ b/test/e2e/features/connections/connections-db.test.ts
@@ -10,7 +10,7 @@ test.use({
 	suiteId: __filename
 });
 
-test.describe('SQLite DB Connection', { tag: ['@web', '@win', '@pr'] }, () => {
+test.describe('SQLite DB Connection', { tag: ['@web', '@win', '@pr', '@connections'] }, () => {
 	test.beforeAll(async function ({ userSettings }) {
 		await userSettings.set([['positron.connections.showConnectionPane', 'true']], true);
 	});
diff --git a/test/e2e/features/console/console-ansi.test.ts b/test/e2e/features/console/console-ansi.test.ts
index 6645ae304b9..44b81ce66b6 100644
--- a/test/e2e/features/console/console-ansi.test.ts
+++ b/test/e2e/features/console/console-ansi.test.ts
@@ -10,7 +10,7 @@ test.use({
 	suiteId: __filename
 });
 
-test.describe('Console ANSI styling', { tag: ['@pr'] }, () => {
+test.describe('Console ANSI styling', { tag: ['@pr', '@console'] }, () => {
 	test.beforeEach(async function ({ app }) {
 		await app.workbench.positronLayouts.enterLayout('fullSizedPanel');
 	});
diff --git a/test/e2e/features/console/console-autocomplete.test.ts b/test/e2e/features/console/console-autocomplete.test.ts
index 8177fb1effb..c7a25f2cbe5 100644
--- a/test/e2e/features/console/console-autocomplete.test.ts
+++ b/test/e2e/features/console/console-autocomplete.test.ts
@@ -11,7 +11,7 @@ test.use({
 });
 
 test.describe('Console Autocomplete', {
-	tag: ['@web', '@win']
+	tag: ['@web', '@win', '@console']
 }, () => {
 	test('Python - Verify Console Autocomplete [C947968]', async function ({ app, python }) {
 		await app.workbench.positronConsole.pasteCodeToConsole('import pandas as pd');
diff --git a/test/e2e/features/console/console-clipboard.test.ts b/test/e2e/features/console/console-clipboard.test.ts
index c37d827ce7d..5e38cc2ee36 100644
--- a/test/e2e/features/console/console-clipboard.test.ts
+++ b/test/e2e/features/console/console-clipboard.test.ts
@@ -11,7 +11,7 @@ test.use({
 	suiteId: __filename
 });
 
-test.describe('Console - Clipboard', () => {
+test.describe('Console - Clipboard', { tag: ['@console'] }, () => {
 	test('Python - Copy from console & paste to console [C608100]', async function ({ app, python }) {
 		await testBody(app);
 	});
diff --git a/test/e2e/features/console/console-history.test.ts b/test/e2e/features/console/console-history.test.ts
index 94291ff19e0..bee1cabafaf 100644
--- a/test/e2e/features/console/console-history.test.ts
+++ b/test/e2e/features/console/console-history.test.ts
@@ -10,7 +10,7 @@ test.use({
 });
 
 test.describe('Console History', {
-	tag: ['@web', '@win']
+	tag: ['@web', '@win', '@console']
 }, () => {
 	test.afterEach(async function ({ app }) {
 		app.workbench.positronConsole.sendKeyboardKey('Escape');
diff --git a/test/e2e/features/console/console-input.test.ts b/test/e2e/features/console/console-input.test.ts
index e57e0584035..8eb3b5a3b20 100644
--- a/test/e2e/features/console/console-input.test.ts
+++ b/test/e2e/features/console/console-input.test.ts
@@ -10,7 +10,7 @@ test.use({
 });
 
 test.describe('Console Input', {
-	tag: ['@web', '@pr', '@win']
+	tag: ['@web', '@pr', '@win', '@console']
 }, () => {
 
 	test.describe('Console Input - Python', () => {
diff --git a/test/e2e/features/console/console-output.test.ts b/test/e2e/features/console/console-output.test.ts
index 9fef9ed6c4e..7dbbd66e124 100644
--- a/test/e2e/features/console/console-output.test.ts
+++ b/test/e2e/features/console/console-output.test.ts
@@ -9,7 +9,7 @@ test.use({
 	suiteId: __filename
 });
 
-test.describe('Console Output', { tag: ['@win'] }, () => {
+test.describe('Console Output', { tag: ['@win', '@console'] }, () => {
 	test('R - Console output in a loop with short pauses [C885225]', async function ({ app, r }) {
 		await app.workbench.positronConsole.pasteCodeToConsole(rCode);
 		await app.workbench.positronConsole.sendEnterKey();
diff --git a/test/e2e/features/console/console-python.test.ts b/test/e2e/features/console/console-python.test.ts
index 92edbaadede..fa48b0fd742 100644
--- a/test/e2e/features/console/console-python.test.ts
+++ b/test/e2e/features/console/console-python.test.ts
@@ -9,7 +9,7 @@ test.use({
 	suiteId: __filename
 });
 
-test.describe('Console Pane: Python', { tag: ['@web', '@win'] }, () => {
+test.describe('Console Pane: Python', { tag: ['@web', '@win', '@console'] }, () => {
 
 	test('Verify restart button inside the console [C377918]', async function ({ app, python }) {
 		await expect(async () => {
diff --git a/test/e2e/features/console/console-r.test.ts b/test/e2e/features/console/console-r.test.ts
index 8633334cf8d..f1110979bcd 100644
--- a/test/e2e/features/console/console-r.test.ts
+++ b/test/e2e/features/console/console-r.test.ts
@@ -10,7 +10,7 @@ test.use({
 });
 
 test.describe('Console Pane: R', {
-	tag: ['@web', '@win']
+	tag: ['@web', '@win', '@console']
 }, () => {
 	test.beforeAll(async function ({ app }) {
 		// Need to make console bigger to see all bar buttons
diff --git a/test/e2e/features/data-explorer/100x100-pandas.test.ts b/test/e2e/features/data-explorer/100x100-pandas.test.ts
index 0ef80a156aa..796e89eb200 100644
--- a/test/e2e/features/data-explorer/100x100-pandas.test.ts
+++ b/test/e2e/features/data-explorer/100x100-pandas.test.ts
@@ -11,7 +11,7 @@ test.use({
 	suiteId: __filename
 });
 
-test('Data Explorer 100x100 - Python - Pandas [C557563]', { tag: ['@win'] }, async function ({ app, python }) {
+test('Data Explorer 100x100 - Python - Pandas [C557563]', { tag: ['@win', '@data-explorer'] }, async function ({ app, python }) {
 	test.slow();
 
 	const dataFrameName = 'pandas100x100';
diff --git a/test/e2e/features/data-explorer/100x100-polars.test.ts b/test/e2e/features/data-explorer/100x100-polars.test.ts
index e52117e2140..8d5ec0242f9 100644
--- a/test/e2e/features/data-explorer/100x100-polars.test.ts
+++ b/test/e2e/features/data-explorer/100x100-polars.test.ts
@@ -11,7 +11,7 @@ test.use({
 	suiteId: __filename
 });
 
-test('Data Explorer 100x100 - Python - Polars [C674520]', { tag: ['@win'] }, async function ({ app, python }) {
+test('Data Explorer 100x100 - Python - Polars [C674520]', { tag: ['@win', '@data-explorer'] }, async function ({ app, python }) {
 	test.slow();
 
 	const dataFrameName = 'polars100x100';
diff --git a/test/e2e/features/data-explorer/100x100-r.test.ts b/test/e2e/features/data-explorer/100x100-r.test.ts
index fcd63bef79a..525feb05001 100644
--- a/test/e2e/features/data-explorer/100x100-r.test.ts
+++ b/test/e2e/features/data-explorer/100x100-r.test.ts
@@ -11,7 +11,7 @@ test.use({
 	suiteId: __filename
 });
 
-test('Data Explorer 100x100 - R [C674521]', { tag: ['@win'] }, async function ({ app, r }) {
+test('Data Explorer 100x100 - R [C674521]', { tag: ['@win', '@data-explorer'] }, async function ({ app, r }) {
 	test.slow();
 
 	// Test the data explorer.
diff --git a/test/e2e/features/data-explorer/data-explorer-headless.test.ts b/test/e2e/features/data-explorer/data-explorer-headless.test.ts
index 30a62a97e60..9f5c5a37f2f 100644
--- a/test/e2e/features/data-explorer/data-explorer-headless.test.ts
+++ b/test/e2e/features/data-explorer/data-explorer-headless.test.ts
@@ -12,7 +12,7 @@ test.use({
 });
 
 test.describe('Headless Data Explorer - Large Data Frame', {
-	tag: ['@web']
+	tag: ['@web', '@data-explorer', '@duck-db']
 }, () => {
 	// python fixture not actually needed but serves as a long wait so that we can be sure
 	// headless/duckdb open will work
diff --git a/test/e2e/features/data-explorer/data-explorer-python-pandas.test.ts b/test/e2e/features/data-explorer/data-explorer-python-pandas.test.ts
index 2da25736d18..25f1bf0c7dc 100644
--- a/test/e2e/features/data-explorer/data-explorer-python-pandas.test.ts
+++ b/test/e2e/features/data-explorer/data-explorer-python-pandas.test.ts
@@ -11,7 +11,7 @@ test.use({
 });
 
 test.describe('Data Explorer - Python Pandas', {
-	tag: ['@web', '@win', '@pr']
+	tag: ['@web', '@win', '@pr', '@data-explorer']
 }, () => {
 	test('Python Pandas - Verifies basic data explorer functionality [C557556]', async function ({ app, python, logger }) {
 		// modified snippet from https://www.geeksforgeeks.org/python-pandas-dataframe/
diff --git a/test/e2e/features/data-explorer/data-explorer-python-polars.test.ts b/test/e2e/features/data-explorer/data-explorer-python-polars.test.ts
index be3b88e2770..9edd59f9534 100644
--- a/test/e2e/features/data-explorer/data-explorer-python-polars.test.ts
+++ b/test/e2e/features/data-explorer/data-explorer-python-polars.test.ts
@@ -11,7 +11,7 @@ test.use({
 });
 
 test.describe('Data Explorer - Python Polars', {
-	tag: ['@win', '@web', '@pr']
+	tag: ['@win', '@web', '@pr', '@data-explorer']
 }, () => {
 	test('Python Polars - Verifies basic data explorer functionality [C644538]', async function ({ app, python, logger }) {
 		await app.workbench.quickaccess.openFile(join(app.workspacePathOrFolder, 'workspaces', 'polars-dataframe-py', 'polars_basic.py'));
diff --git a/test/e2e/features/data-explorer/data-explorer-r.test.ts b/test/e2e/features/data-explorer/data-explorer-r.test.ts
index 7832eeeaf27..bf4ac265251 100644
--- a/test/e2e/features/data-explorer/data-explorer-r.test.ts
+++ b/test/e2e/features/data-explorer/data-explorer-r.test.ts
@@ -10,7 +10,7 @@ test.use({
 });
 
 test.describe('Data Explorer - R ', {
-	tag: ['@web', '@win']
+	tag: ['@web', '@win', '@data-explorer']
 }, () => {
 	test('R - Verifies basic data explorer functionality [C609620]', { tag: ['@pr'] }, async function ({ app, r, logger }) {
 		// snippet from https://www.w3schools.com/r/r_data_frames.asp
diff --git a/test/e2e/features/data-explorer/duckdb-sparklines.test.ts b/test/e2e/features/data-explorer/duckdb-sparklines.test.ts
index 8f112f135fa..66aa57625cd 100644
--- a/test/e2e/features/data-explorer/duckdb-sparklines.test.ts
+++ b/test/e2e/features/data-explorer/duckdb-sparklines.test.ts
@@ -11,7 +11,7 @@ test.use({
 });
 
 test.describe('Data Explorer - DuckDB Column Summary', {
-	tag: ['@web', '@win', '@pr']
+	tag: ['@web', '@win', '@pr', '@data-explorer', '@duck-db']
 }, () => {
 	// python fixture not actually needed but serves as a long wait so that we can be sure
 	// headless/duckdb open will work
diff --git a/test/e2e/features/data-explorer/large-data-frame.test.ts b/test/e2e/features/data-explorer/large-data-frame.test.ts
index 90c122c17e8..18ec4c85577 100644
--- a/test/e2e/features/data-explorer/large-data-frame.test.ts
+++ b/test/e2e/features/data-explorer/large-data-frame.test.ts
@@ -15,7 +15,7 @@ test.use({
 });
 
 test.describe('Data Explorer - Large Data Frame', {
-	tag: ['@pr', '@web', '@win']
+	tag: ['@pr', '@web', '@win', '@data-explorer']
 }, () => {
 	test.beforeEach(async function ({ app }) {
 		await app.workbench.positronLayouts.enterLayout('stacked');
diff --git a/test/e2e/features/data-explorer/sparklines.test.ts b/test/e2e/features/data-explorer/sparklines.test.ts
index c4a365b5789..7c0e0a177f2 100644
--- a/test/e2e/features/data-explorer/sparklines.test.ts
+++ b/test/e2e/features/data-explorer/sparklines.test.ts
@@ -11,7 +11,7 @@ test.use({
 });
 
 test.describe('Data Explorer - Sparklines', {
-	tag: ['@web', '@win']
+	tag: ['@web', '@win', '@data-explorer']
 }, () => {
 
 	test.beforeEach(async function ({ app }) {
diff --git a/test/e2e/features/data-explorer/very-large-data-frame.test.ts b/test/e2e/features/data-explorer/very-large-data-frame.test.ts
index c990575ee1c..44cc8602b53 100644
--- a/test/e2e/features/data-explorer/very-large-data-frame.test.ts
+++ b/test/e2e/features/data-explorer/very-large-data-frame.test.ts
@@ -19,7 +19,7 @@ const objectKey = "largeParquet.parquet";
 
 const githubActions = process.env.GITHUB_ACTIONS === "true";
 
-test.describe('Data Explorer - Very Large Data Frame', { tag: ['@win'] }, () => {
+test.describe('Data Explorer - Very Large Data Frame', { tag: ['@win', '@data-explorer'] }, () => {
 	test.beforeAll(async function ({ app }) {
 		if (githubActions) {
 			const localFilePath = join(app.workspacePathOrFolder, "data-files", objectKey);
diff --git a/test/e2e/features/data-explorer/xlsx-data-frame.test.ts b/test/e2e/features/data-explorer/xlsx-data-frame.test.ts
index 5af6398a014..062097c2ba8 100644
--- a/test/e2e/features/data-explorer/xlsx-data-frame.test.ts
+++ b/test/e2e/features/data-explorer/xlsx-data-frame.test.ts
@@ -11,7 +11,7 @@ test.use({
 });
 
 test.describe('Data Explorer - XLSX', {
-	tag: ['@web', '@win']
+	tag: ['@web', '@win', '@data-explorer']
 }, () => {
 
 	test.afterEach(async function ({ app }) {
diff --git a/test/e2e/features/editor/fast-execution.test.ts b/test/e2e/features/editor/fast-execution.test.ts
index dea0951cc81..83e9c7ffe71 100644
--- a/test/e2e/features/editor/fast-execution.test.ts
+++ b/test/e2e/features/editor/fast-execution.test.ts
@@ -12,7 +12,7 @@ test.use({
 
 const FILENAME = 'fast-execution.r';
 
-test.describe('R Fast Execution', { tag: ['@web'] }, () => {
+test.describe('R Fast Execution', { tag: ['@web', '@editor'] }, () => {
 	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));
 
diff --git a/test/e2e/features/help/f1.test.ts b/test/e2e/features/help/f1.test.ts
index c09496cea6b..e4067c62668 100644
--- a/test/e2e/features/help/f1.test.ts
+++ b/test/e2e/features/help/f1.test.ts
@@ -12,7 +12,7 @@ test.use({
 
 
 test.describe('F1 Help #web #win', {
-	tag: ['@web', '@win']
+	tag: ['@web', '@win', '@help']
 }, () => {
 
 	test('R - Verifies basic F1 help functionality [C1018854]', async function ({ app, r }) {
diff --git a/test/e2e/features/help/help.test.ts b/test/e2e/features/help/help.test.ts
index ff2bb98ec7f..dfd3f826a39 100644
--- a/test/e2e/features/help/help.test.ts
+++ b/test/e2e/features/help/help.test.ts
@@ -9,7 +9,7 @@ test.use({
 	suiteId: __filename
 });
 
-test.describe('Help', () => {
+test.describe('Help', { tag: ['@help'] }, () => {
 
 	test('Python - Verifies basic help functionality [C633814]', async function ({ app, python }) {
 		await app.workbench.positronConsole.executeCode('Python', `?load`, '>>>');
diff --git a/test/e2e/features/layouts/layouts.test.ts b/test/e2e/features/layouts/layouts.test.ts
index 40c74c2bb40..1f92cca4494 100644
--- a/test/e2e/features/layouts/layouts.test.ts
+++ b/test/e2e/features/layouts/layouts.test.ts
@@ -9,7 +9,7 @@ test.use({
 	suiteId: __filename
 });
 
-test.describe('Layouts', { tag: ['@web'] }, () => {
+test.describe('Layouts', { tag: ['@web', '@layouts'] }, () => {
 
 	test.describe('Stacked Layout', () => {
 
diff --git a/test/e2e/features/new-project-wizard/new-project-python.test.ts b/test/e2e/features/new-project-wizard/new-project-python.test.ts
index e8ac2d2f6e6..bded9b76400 100644
--- a/test/e2e/features/new-project-wizard/new-project-python.test.ts
+++ b/test/e2e/features/new-project-wizard/new-project-python.test.ts
@@ -14,7 +14,7 @@ test.beforeEach(async function ({ app }) {
 	await app.workbench.positronConsole.waitForReadyOrNoInterpreter();
 });
 
-test.describe('Python - New Project Wizard', () => {
+test.describe('Python - New Project Wizard', { tag: ['@new-project-wizard'] }, () => {
 	const defaultProjectName = 'my-python-project';
 
 	test('Create a new Conda environment [C628628]', async function ({ app, page }) {
diff --git a/test/e2e/features/new-project-wizard/new-project-r-jupyter.test.ts b/test/e2e/features/new-project-wizard/new-project-r-jupyter.test.ts
index 8393d5186af..c039e720f43 100644
--- a/test/e2e/features/new-project-wizard/new-project-r-jupyter.test.ts
+++ b/test/e2e/features/new-project-wizard/new-project-r-jupyter.test.ts
@@ -15,7 +15,7 @@ test.beforeEach(async function ({ app }) {
 	await app.workbench.positronLayouts.enterLayout("stacked");
 });
 
-test.describe('R - New Project Wizard', () => {
+test.describe('R - New Project Wizard', { tag: ['@new-project-wizard'] }, () => {
 	test.describe.configure({ mode: 'serial' });
 
 	const defaultProjectName = 'my-r-project';
diff --git a/test/e2e/features/notebook/notebook-create.test.ts b/test/e2e/features/notebook/notebook-create.test.ts
index 7bae63a1c76..7e1594ab917 100644
--- a/test/e2e/features/notebook/notebook-create.test.ts
+++ b/test/e2e/features/notebook/notebook-create.test.ts
@@ -9,7 +9,7 @@ test.use({
 	suiteId: __filename
 });
 
-test.describe('Notebooks', { tag: ['@pr', '@web', '@win'] }, () => {
+test.describe('Notebooks', { tag: ['@pr', '@web', '@win', '@notebook'] }, () => {
 	test.describe('Python Notebooks', () => {
 		test.beforeEach(async function ({ app, python }) {
 			await app.workbench.positronLayouts.enterLayout('notebook');
diff --git a/test/e2e/features/notebook/notebook-large-python.test.ts b/test/e2e/features/notebook/notebook-large-python.test.ts
index 3c4825a8c94..35b6b8d6d17 100644
--- a/test/e2e/features/notebook/notebook-large-python.test.ts
+++ b/test/e2e/features/notebook/notebook-large-python.test.ts
@@ -12,9 +12,7 @@ test.use({
 });
 
 // Note that this test is too heavy to pass on web and windows
-test.describe('Large Python Notebook', {
-	annotation: [{ type: 'issue', description: 'This test is too heavy to run in CICD due to snapshots on the excessive scrolling.' }],
-}, () => {
+test.describe('Large Python Notebook', { tag: ['@notebook'] }, () => {
 
 	test('Python - Large notebook execution [C983592]', async function ({ app, python }) {
 		test.setTimeout(480_000); // huge timeout because this is a heavy test
diff --git a/test/e2e/features/outline/outline.test.ts b/test/e2e/features/outline/outline.test.ts
index 10657c26e7d..16fe6d37a31 100644
--- a/test/e2e/features/outline/outline.test.ts
+++ b/test/e2e/features/outline/outline.test.ts
@@ -11,7 +11,7 @@ test.use({
 });
 
 test.describe('Outline #web #win', {
-	tag: ['@web', '@win']
+	tag: ['@web', '@win', '@outline']
 }, () => {
 
 	test('Python - Verify Outline Contents [C956870]', async function ({ app, python }) {
diff --git a/test/e2e/features/output/console-ouput-log.test.ts b/test/e2e/features/output/console-ouput-log.test.ts
index 1c0ef2ea711..b10ef5c1058 100644
--- a/test/e2e/features/output/console-ouput-log.test.ts
+++ b/test/e2e/features/output/console-ouput-log.test.ts
@@ -9,7 +9,7 @@ test.use({
 	suiteId: __filename
 });
 
-test.describe('Console Output Log', { tag: ['@web'] }, () => {
+test.describe('Console Output Log', { tag: ['@web', '@output', '@console'] }, () => {
 	test.beforeEach(async function ({ app }) {
 		await app.workbench.positronLayouts.enterLayout('stacked');
 	});
diff --git a/test/e2e/features/plots/plots.test.ts b/test/e2e/features/plots/plots.test.ts
index caf3871584d..f0a1d8dc285 100644
--- a/test/e2e/features/plots/plots.test.ts
+++ b/test/e2e/features/plots/plots.test.ts
@@ -15,7 +15,7 @@ test.use({
 	suiteId: __filename
 });
 
-test.describe('Plots', () => {
+test.describe('Plots', { tag: ['@plots', '@editor'] }, () => {
 	// Some tests are not tagged @win because they woould require a new master image.
 	test.describe('Python Plots', () => {
 
diff --git a/test/e2e/features/quarto/quarto.test.ts b/test/e2e/features/quarto/quarto.test.ts
index e5262a22d7f..d20399f4ffb 100644
--- a/test/e2e/features/quarto/quarto.test.ts
+++ b/test/e2e/features/quarto/quarto.test.ts
@@ -14,7 +14,7 @@ test.use({
 	suiteId: __filename
 });
 
-test.describe('Quarto', { tag: ['@web'] }, () => {
+test.describe('Quarto', { tag: ['@web', '@quarto'] }, () => {
 	test.beforeAll(async function ({ app, browserName }) {
 		await app.workbench.quickaccess.openFile(path.join(app.workspacePathOrFolder, 'workspaces', 'quarto_basic', 'quarto_basic.qmd'));
 		isWeb = browserName === 'chromium';
diff --git a/test/e2e/features/r-markdown/r-markdown.test.ts b/test/e2e/features/r-markdown/r-markdown.test.ts
index 631351556c0..b61ff25424b 100644
--- a/test/e2e/features/r-markdown/r-markdown.test.ts
+++ b/test/e2e/features/r-markdown/r-markdown.test.ts
@@ -10,7 +10,7 @@ test.use({
 	suiteId: __filename
 });
 
-test.describe('R Markdown', { tag: ['@web'] }, () => {
+test.describe('R Markdown', { tag: ['@web', '@r-markdown'] }, () => {
 	test('Render R Markdown [C680618]', async function ({ app, r }) {
 		await app.workbench.quickaccess.openFile(join(app.workspacePathOrFolder, 'workspaces', 'basic-rmd-file', 'basicRmd.rmd'));
 
diff --git a/test/e2e/features/r-pkg-development/r-pkg-development.test.ts b/test/e2e/features/r-pkg-development/r-pkg-development.test.ts
index fb84207ee32..198e80a05d8 100644
--- a/test/e2e/features/r-pkg-development/r-pkg-development.test.ts
+++ b/test/e2e/features/r-pkg-development/r-pkg-development.test.ts
@@ -10,7 +10,7 @@ test.use({
 	suiteId: __filename
 });
 
-test.describe('R Package Development', { tag: ['@web'] }, () => {
+test.describe('R Package Development', { tag: ['@web', '@r-pkg-development'] }, () => {
 	test.beforeAll(async function ({ app, r, userSettings }) {
 		try {
 			// don't use native file picker
diff --git a/test/e2e/features/reticulate/reticulate.test.ts b/test/e2e/features/reticulate/reticulate.test.ts
index 78370accdea..ca866ea4e4b 100644
--- a/test/e2e/features/reticulate/reticulate.test.ts
+++ b/test/e2e/features/reticulate/reticulate.test.ts
@@ -14,7 +14,7 @@ test.use({
 // to the installed python path
 
 test.describe('Reticulate', {
-	tag: ['@web'],
+	tag: ['@web', '@reticulate'],
 	annotation: [{ type: 'issue', description: 'https://github.com/posit-dev/positron/issues/5226' }]
 }, () => {
 	test.beforeAll(async function ({ app, userSettings }) {
diff --git a/test/e2e/features/test-explorer/test-explorer.test.ts b/test/e2e/features/test-explorer/test-explorer.test.ts
index 24270bc3c47..5a75d49b4c1 100644
--- a/test/e2e/features/test-explorer/test-explorer.test.ts
+++ b/test/e2e/features/test-explorer/test-explorer.test.ts
@@ -10,7 +10,7 @@ test.use({
 	suiteId: __filename
 });
 
-test.describe('Test Explorer', () => {
+test.describe('Test Explorer', { tag: ['@test-explorer'] }, () => {
 	test.beforeAll(async function ({ app, r, userSettings }) {
 		try {
 			// don't use native file picker
diff --git a/test/e2e/features/top-action-bar/interpreter-dropdown.test.ts b/test/e2e/features/top-action-bar/interpreter-dropdown.test.ts
index e890658b2fd..037746e7965 100644
--- a/test/e2e/features/top-action-bar/interpreter-dropdown.test.ts
+++ b/test/e2e/features/top-action-bar/interpreter-dropdown.test.ts
@@ -14,7 +14,7 @@ test.use({
 	suiteId: __filename
 });
 
-test.describe.skip('Interpreter Dropdown in Top Action Bar', { tag: ['@web'] }, () => {
+test.describe.skip('Interpreter Dropdown in Top Action Bar', { tag: ['@web', '@top-action-bar'] }, () => {
 	let interpreterDropdown: PositronInterpreterDropdown;
 	let positronConsole: PositronConsole;
 
diff --git a/test/e2e/features/top-action-bar/top-action-bar-save.test.ts b/test/e2e/features/top-action-bar/top-action-bar-save.test.ts
index fdfa7dee84c..b3fee5f5173 100644
--- a/test/e2e/features/top-action-bar/top-action-bar-save.test.ts
+++ b/test/e2e/features/top-action-bar/top-action-bar-save.test.ts
@@ -11,7 +11,7 @@ test.use({
 });
 
 test.describe('Top Action Bar - Save Actions', {
-	tag: ['@web']
+	tag: ['@web', '@top-action-bar']
 }, () => {
 
 	test.beforeAll(async function ({ app, userSettings }) {
diff --git a/test/e2e/features/variables/variables-expanded.test.ts b/test/e2e/features/variables/variables-expanded.test.ts
index 14536309336..155d3142636 100644
--- a/test/e2e/features/variables/variables-expanded.test.ts
+++ b/test/e2e/features/variables/variables-expanded.test.ts
@@ -9,7 +9,7 @@ test.use({
 	suiteId: __filename
 });
 
-test.describe('Variables - Expanded View', { tag: ['@web'] }, () => {
+test.describe('Variables - Expanded View', { tag: ['@web', '@variables'] }, () => {
 	test.beforeEach(async function ({ app, python }) {
 		await app.workbench.positronConsole.executeCode('Python', script, '>>>');
 		await app.workbench.positronLayouts.enterLayout('fullSizedAuxBar');
@@ -31,14 +31,14 @@ import polars as pl
 
 from datetime import date
 df = pl.DataFrame(
-    {
-        "foo": [1, 2, 3],
-        "bar": [6.0, 7.0, 8.0],
-        "ham": [date(2020, 1, 2), date(2021, 3, 4), date(2022, 5, 6)],
-        "green": [None, 2, 3],
-        "eggs": [0.5, None, 2.5],
-        "cheese": [True, None, False],
-    }
+	{
+		"foo": [1, 2, 3],
+		"bar": [6.0, 7.0, 8.0],
+		"ham": [date(2020, 1, 2), date(2021, 3, 4), date(2022, 5, 6)],
+		"green": [None, 2, 3],
+		"eggs": [0.5, None, 2.5],
+		"cheese": [True, None, False],
+	}
 )
 `;
 
diff --git a/test/e2e/features/variables/variables-notebook.test.ts b/test/e2e/features/variables/variables-notebook.test.ts
index d160d256695..c0d897f0141 100644
--- a/test/e2e/features/variables/variables-notebook.test.ts
+++ b/test/e2e/features/variables/variables-notebook.test.ts
@@ -14,7 +14,7 @@ test.afterEach(async function ({ app }) {
 	await app.workbench.positronLayouts.enterLayout('stacked');
 });
 
-test.describe('Variables Pane - Notebook', { tag: ['@pr', '@web'] }, () => {
+test.describe('Variables Pane - Notebook', { tag: ['@pr', '@web', '@variables', '@notebook'] }, () => {
 	test('Python - Verifies Variables pane basic function for notebook [C669188]', async function ({ app, python }) {
 		await app.workbench.positronNotebooks.createNewNotebook();
 
diff --git a/test/e2e/features/variables/variables-pane.test.ts b/test/e2e/features/variables/variables-pane.test.ts
index c5c9a92f1b2..c9b20d40cfa 100644
--- a/test/e2e/features/variables/variables-pane.test.ts
+++ b/test/e2e/features/variables/variables-pane.test.ts
@@ -9,7 +9,7 @@ test.use({
 	suiteId: __filename
 });
 
-test.describe('Variables Pane', { tag: ['@web', '@win', '@pr'] }, () => {
+test.describe('Variables Pane', { tag: ['@web', '@win', '@pr', '@variables'] }, () => {
 	test.beforeEach(async function ({ app }) {
 		await app.workbench.positronLayouts.enterLayout('stacked');
 	});
diff --git a/test/e2e/features/viewer/viewer.test.ts b/test/e2e/features/viewer/viewer.test.ts
index 092e1d9650c..c453ddaa24e 100644
--- a/test/e2e/features/viewer/viewer.test.ts
+++ b/test/e2e/features/viewer/viewer.test.ts
@@ -9,7 +9,7 @@ test.use({
 	suiteId: __filename
 });
 
-test.describe('Viewer', () => {
+test.describe('Viewer', { tag: ['@viewer'] }, () => {
 
 	test.afterEach(async function ({ app }) {
 		await app.workbench.positronViewer.clearViewer();
diff --git a/test/e2e/features/welcome/welcome.test.ts b/test/e2e/features/welcome/welcome.test.ts
index fc50ebcd3c1..ee3c0ac1390 100644
--- a/test/e2e/features/welcome/welcome.test.ts
+++ b/test/e2e/features/welcome/welcome.test.ts
@@ -9,7 +9,7 @@ test.use({
 	suiteId: __filename
 });
 
-test.describe('Welcome Page', () => {
+test.describe('Welcome Page', { tag: ['@welcome'] }, () => {
 	test.beforeEach(async function ({ app }) {
 		await app.workbench.quickaccess.runCommand('Help: Welcome');
 	});