activate git before smoke tests

joaomoreno · joaomoreno · commit dde577b23e1e · 2020-02-05T15:03:05.000+01:00
diff --git a/extensions/git/package.json b/extensions/git/package.json
@@ -26,11 +26,6 @@
   },
   "contributes": {
     "commands": [
-      {
-        "command": "git.activate",
-        "title": "%command.activate%",
-        "category": "Git"
-      },
       {
         "command": "git.setLogLevel",
         "title": "%command.setLogLevel%",
@@ -456,10 +451,6 @@
     ],
     "menus": {
       "commandPalette": [
-        {
-          "command": "git.activate",
-          "when": "false"
-        },
         {
           "command": "git.clone",
           "when": "config.git.enabled"
diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json
@@ -1,7 +1,6 @@
 {
 	"displayName": "Git",
 	"description": "Git SCM Integration",
-	"command.activate": "Activate",
 	"command.setLogLevel": "Set Log Level...",
 	"command.clone": "Clone",
 	"command.init": "Initialize Repository",
diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
@@ -253,11 +253,6 @@ export class CommandCenter {
 		});
 	}
 
-	@command('git.activate')
-	async activate(): Promise<void> {
-		// noop
-	}
-
 	@command('git.setLogLevel')
 	async setLogLevel(): Promise<void> {
 		const createItem = (logLevel: LogLevel) => ({
diff --git a/extensions/git/src/test/smoke.test.ts b/extensions/git/src/test/smoke.test.ts
@@ -49,8 +49,9 @@ suite('git smoke test', function () {
 		cp.execSync('git commit -m "initial commit"', { cwd });
 
 		// make sure git is activated
-		await commands.executeCommand('git.activate');
-		git = extensions.getExtension<GitExtension>('vscode.git')!.exports.getAPI(1);
+		const ext = extensions.getExtension<GitExtension>('vscode.git');
+		await ext?.activate();
+		git = ext!.exports.getAPI(1);
 
 		if (git.repositories.length === 0) {
 			await eventToPromise(git.onDidOpenRepository);

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"displayName": "Git",`
`3`	`3`	`"description": "Git SCM Integration",`
`4`		`- "command.activate": "Activate",`
`5`	`4`	`"command.setLogLevel": "Set Log Level...",`
`6`	`5`	`"command.clone": "Clone",`
`7`	`6`	`"command.init": "Initialize Repository",`