e2e-test: remove test/automation

.eslint-ignore

@@ -35,7 +35,7 @@
 **/src/vs/base/test/common/filters.perf.data.js
 **/src/vs/loader.js
 **/test/unit/assert.js
-**/test/automation/out/**
+**/test/e2e/out/**
 **/typings/**
 **/src/react.js
 **/src/react-dom.js

.eslintrc.json

@@ -1111,36 +1111,13 @@
 					{
 						"target": "test/e2e/**",
 						"restrictions": [
-							"test/automation",
 							"test/e2e/**",
 							"@vscode/*",
 							"@parcel/*",
 							"@playwright/*",
 							"*" // node modules
 						]
 					},
-					{
-						"target": "test/smoke/**",
-						"restrictions": [
-							"test/automation",
-							"test/smoke/**",
-							"@vscode/*",
-							"@parcel/*",
-							"@playwright/*",
-							"*" // node modules
-						]
-					},
-					{
-						"target": "test/automation/**",
-						"restrictions": [
-							"test/automation/**",
-							"@vscode/*",
-							"@parcel/*",
-							"playwright-core/**",
-							"@playwright/*",
-							"*" // node modules
-						]
-					},
 					{
 						"target": "test/integration/**",
 						"restrictions": [

.github/actions/setup-build-env/action.yml

@@ -39,7 +39,6 @@ runs:
         # Perform the main npm command; this installs all Node packages and
         # dependencies
         npm ci --fetch-timeout 120000
-        npm --prefix test/automation ci
         npm --prefix test/e2e ci
 
     - name: Compile and Download

.github/actions/setup-test-env/action.yml

@@ -16,7 +16,7 @@ runs:
   steps:
     - name: Compile E2E Tests
       shell: bash
-      run: npm --prefix test/automation run compile && npm --prefix test/e2e run compile
+      run: npm --prefix test/e2e run compile
 
     - name: Setup AWS S3 Access
       uses: aws-actions/configure-aws-credentials@v4

.github/workflows/test-e2e-release.yml

@@ -16,6 +16,7 @@ on:
         options:
           - failure
           - always
+          - never
 
 permissions:
   id-token: write
@@ -45,9 +46,7 @@ jobs:
       - name: Compile tests
         run: |
           npm install
-          npm --prefix test/automation install
           npm --prefix test/e2e install
-          npm --prefix test/automation run compile
           npm --prefix test/e2e run compile
 
       - name: Get & install latest release
@@ -111,10 +110,14 @@ jobs:
     needs: [e2e-electron]
     runs-on: ubuntu-latest
     if: always()
+    env:
+      notify_on: ${{ github.event_name == 'schedule' && 'always' || inputs.notify_on || 'failure' }}
     steps:
+      - run: |
+          echo "Will notify on: ${{ env.notify_on }}"
       - name: Notify Slack
         uses: midleman/slack-workflow-status@master
         with:
           repo_token: ${{ secrets.POSITRON_GITHUB_PAT }}
           slack_webhook_url: ${{ secrets.SLACK_TEST_RESULTS_WEBHOOK_URL }}
-          notify_on: ${{ inputs.notify_on }}
+          notify_on: ${{ env.notify_on }}

.github/workflows/test-e2e-windows.yml

@@ -94,15 +94,13 @@ jobs:
         run: |
           corepack enable
           .\scripts\run-with-retry.ps1 -maxAttempts 3 -command "npm install --fetch-timeout 120000"
-          npm --prefix test/automation ci
           npm --prefix test/e2e ci
 
       - name: Compile and Download
         run: npm exec -- npm-run-all --max-old-space-size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions
 
       - name: Compile E2E Tests
         run: |
-          npm --prefix test/automation run compile
           npm --prefix test/e2e run compile
 
       - name: Install python dependencies

.vscode/settings.json

@@ -28,8 +28,6 @@
 		"extensions/**/dist/**": true,
 		"extensions/**/out/**": true,
 		"test/e2e/out/**": true,
-		"test/smoke/out/**": true,
-		"test/automation/out/**": true,
 		"test/integration/browser/out/**": true,
 		"src/vs/base/test/common/filters.perf.data.js": true,
 		"src/vs/base/test/node/uri.perf.data.txt": true,
@@ -51,8 +49,6 @@
 		"extensions/**/dist/**": true,
 		"extensions/**/out/**": true,
 		"test/e2e/out/**": true,
-		"test/smoke/out/**": true,
-		"test/automation/out/**": true,
 		"test/integration/browser/out/**": true
 	},
 	"files.readonlyExclude": {

build/filters.js

@@ -106,9 +106,7 @@ module.exports.indentationFilter = [
 	'!product.overrides.json',
 
 	// except specific folders
-	'!test/automation/out/**',
 	'!test/monaco/out/**',
-	'!test/smoke/out/**',
 	'!test/e2e/out/**',
 	'!extensions/typescript-language-features/test-workspace/**',
 	'!extensions/typescript-language-features/resources/walkthroughs/**',

build/npm/dirs.js

@@ -74,9 +74,8 @@ const dirs = [
 	'remote/reh-web',
 	'test/integration/browser',
 	'test/monaco',
-	// no need to compile smoke tests during release builds
-	// 'test/automation',
-	// 'test/smoke',
+	// no need to compile e2e tests during release builds
+	// 'test/e2e',
 	// --- End Positron ---
 	'.vscode/extensions/vscode-selfhost-import-aid',
 	'.vscode/extensions/vscode-selfhost-test-provider',

eslint.config.js

@@ -1271,25 +1271,13 @@ export default tseslint.config(
 				{
 					'target': 'test/e2e/**',
 					'restrictions': [
-						'test/automation',
 						'test/e2e/**',
 						'@vscode/*',
 						'@parcel/*',
 						'@playwright/*',
 						'*' // node modules
 					]
 				},
-				{
-					'target': 'test/automation/**',
-					'restrictions': [
-						'test/automation/**',
-						'@vscode/*',
-						'@parcel/*',
-						'playwright-core/**',
-						'@playwright/*',
-						'*' // node modules
-					]
-				},
 				{
 					'target': 'test/integration/**',
 					'restrictions': [

playwright.config.ts

@@ -4,15 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { defineConfig } from '@playwright/test';
-import { CustomTestOptions } from './test/e2e/areas/_test.setup';
+import { CustomTestOptions } from './test/e2e/tests/_test.setup';
 import type { GitHubActionOptions } from '@midleman/github-actions-reporter';
 import { currentsReporter } from '@currents/playwright';
 
 /**
  * See https://playwright.dev/docs/test-configuration.
  */
 export default defineConfig<CustomTestOptions>({
-	globalSetup: './test/e2e/areas/_global.setup.ts',
+	globalSetup: './test/e2e/tests/_global.setup.ts',
 	testDir: './test/e2e',
 	testIgnore: '**/example.test.ts',
 	testMatch: '*.test.ts',

scripts/slack-skipped-tests.js

@@ -8,7 +8,7 @@ const { execSync } = require('child_process');
 const slackSkippedTests = (slackWebhookUrl) => {
 	try {
 		const skippedTests = execSync(
-			`grep -r --include \\*.test.ts -E "describe\\.skip|test\\.skip" test/e2e/areas | sed 's/\\.test\\.ts.*$/.test.ts/'`
+			`grep -r --include \\*.test.ts -E "describe\\.skip|test\\.skip" test/e2e/tests | sed 's/\\.test\\.ts.*$/.test.ts/'`
 		).toString();
 
 		const slackMessage = {