Browse Source

Update nightly extension container name and vsce package scripts for test (#6132)

* Update nightly extension container name and e2e test setup

- Set activity bar title for nightly builds in package.json
- Remove unnecessary extension development flags from e2e tests as the test is set up to test from the vsix package it builds

* remove "--no-dependencies"

* activitybar title

* add back extensionDevelopmentPath
Bee 4 months ago
parent
commit
ee68fac5b8
4 changed files with 8 additions and 15 deletions
  1. 3 2
      .vscode/launch.json
  2. 2 2
      package.json
  3. 2 9
      scripts/publish-nightly.mjs
  4. 1 2
      src/test/e2e/utils/helpers.ts

+ 3 - 2
.vscode/launch.json

@@ -33,7 +33,7 @@
 			"args": [
 				"--extensionDevelopmentPath=${workspaceFolder}",
 				"--disable-workspace-trust",
-				"--disable-extension=claude-dev.cline-nightly",
+				"--disable-extension=saoudrizwan.cline-nightly",
 				"${workspaceFolder}"
 			],
 			"outFiles": [
@@ -53,7 +53,7 @@
 			"args": [
 				"--extensionDevelopmentPath=${workspaceFolder}",
 				"--disable-workspace-trust",
-				"--disable-extension=claude-dev.cline-nightly",
+				"--disable-extension=saoudrizwan.cline-nightly",
 				"${workspaceFolder}"
 			],
 			"outFiles": [
@@ -77,6 +77,7 @@
 				"--sync=off",
 				"--disable-extensions",
 				"--extensionDevelopmentPath=${workspaceFolder}",
+				"--disable-extension=saoudrizwan.cline-nightly",
 				"${workspaceFolder}"
 			],
 			"outFiles": [

+ 2 - 2
package.json

@@ -359,8 +359,8 @@
 		"test:coverage": "vscode-test --coverage",
 		"test:sca-server": "npx tsx watch scripts/test-standalone-core-api-server.ts",
 		"e2e": "playwright test -c playwright.config.ts",
-		"test:e2e": "playwright install && vsce package --no-dependencies --allow-package-secrets sendgrid --out dist/e2e.vsix && node src/test/e2e/utils/build.mjs && playwright test",
-		"test:e2e:optimal": "vsce package --no-dependencies --allow-package-secrets sendgrid --out dist/e2e.vsix && node src/test/e2e/utils/build.mjs && playwright test",
+		"test:e2e": "playwright install && vsce package --allow-package-secrets sendgrid --out dist/e2e.vsix && node src/test/e2e/utils/build.mjs && playwright test",
+		"test:e2e:optimal": "vsce package --allow-package-secrets sendgrid --out dist/e2e.vsix && node src/test/e2e/utils/build.mjs && playwright test",
 		"install:all": "npm install && cd webview-ui && npm install",
 		"dev:webview": "cd webview-ui && npm run dev",
 		"build:webview": "cd webview-ui && npm run build",

+ 2 - 9
scripts/publish-nightly.mjs

@@ -187,6 +187,7 @@ class NightlyPublisher {
 		pkg.version = newVersion
 		pkg.name = config.nightlyName
 		pkg.displayName = config.nightlyDisplayName
+		pkg.contributes.viewsContainers.activitybar.title = config.nightlyDisplayName
 
 		// Save updated package.json
 		log.info("Updating package.json for nightly build")
@@ -206,15 +207,7 @@ class NightlyPublisher {
 
 		log.info("Packaging extension")
 
-		const args = [
-			"package",
-			"--pre-release",
-			"--no-update-package-json",
-			"--no-git-tag-version",
-			"--no-dependencies",
-			"--out",
-			config.vsixPath,
-		]
+		const args = ["package", "--pre-release", "--no-update-package-json", "--no-git-tag-version", "--out", config.vsixPath]
 
 		try {
 			execFileSync("vsce", args, {

+ 1 - 2
src/test/e2e/utils/helpers.ts

@@ -234,7 +234,7 @@ export const e2e = test
 		workspaceType: "single",
 	})
 	.extend<{ openVSCode: (workspacePath: string) => Promise<ElectronApplication> }>({
-		openVSCode: async ({ userDataDir, extensionsDir }, use, testInfo) => {
+		openVSCode: async ({ userDataDir }, use, testInfo) => {
 			const executablePath = await downloadAndUnzipVSCode("stable", undefined, new SilentReporter())
 
 			await use(async (workspacePath: string) => {
@@ -260,7 +260,6 @@ export const e2e = test
 						"--skip-welcome",
 						"--skip-release-notes",
 						`--user-data-dir=${userDataDir}`,
-						`--extensions-dir=${extensionsDir}`,
 						`--install-extension=${path.join(E2ETestHelper.CODEBASE_ROOT_DIR, "dist", "e2e.vsix")}`,
 						`--extensionDevelopmentPath=${E2ETestHelper.CODEBASE_ROOT_DIR}`,
 						workspacePath,