From a33f9dae5bfaa120cc19c4c0a583f101a823f609 Mon Sep 17 00:00:00 2001 From: Stanislav Lvovsky Date: Thu, 30 Sep 2021 15:32:31 +0300 Subject: [PATCH 1/3] chore: enable command --- backend/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/package.json b/backend/package.json index cd86c29..f8257c0 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "guided-development", - "version": "0.1.4", + "version": "0.1.5", "displayName": "Guided Development", "publisher": "SAPOSS", "author": { @@ -55,7 +55,7 @@ "commandPalette": [ { "command": "loadGuidedDevelopment", - "when": "false" + "when": "true" }, { "command": "guidedDevelopment.toggleOutput", From 6d51296d16a98cf1edba772840f31b8e28d31b63 Mon Sep 17 00:00:00 2001 From: Stanislav Lvovsky Date: Fri, 1 Oct 2021 12:46:54 +0300 Subject: [PATCH 2/3] chore: disable command in BAS --- backend/src/extension.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/backend/src/extension.ts b/backend/src/extension.ts index 1897bb1..ee3c7ba 100644 --- a/backend/src/extension.ts +++ b/backend/src/extension.ts @@ -13,6 +13,9 @@ let guidedDevelopmentPanel: GuidedDevelopmentPanel; export async function activate(context: vscode.ExtensionContext) { extContext = context; + + const isInVscode = _.isEmpty(_.get(process, "env.WS_BASE_URL")); + await vscode.commands.executeCommand("setContext", "isInVscode", isInVscode); try { createExtensionLoggerAndSubscribeToLogSettingsChanges(context); From 231cb081bf9107fbcfd73e261f3ca0e456daab84 Mon Sep 17 00:00:00 2001 From: Stanislav Lvovsky Date: Fri, 1 Oct 2021 12:54:56 +0300 Subject: [PATCH 3/3] chore: update tests --- backend/tests/extension.spec.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/tests/extension.spec.ts b/backend/tests/extension.spec.ts index 5b08d40..4270605 100644 --- a/backend/tests/extension.spec.ts +++ b/backend/tests/extension.spec.ts @@ -73,23 +73,23 @@ describe('extension unit test', () => { }); describe('activate', () => { - it("commands registration", () => { + it("commands registration", async () => { // contributorsMock.expects("getContributors"); loggerWrapperMock.expects("createExtensionLoggerAndSubscribeToLogSettingsChanges"); loggerWrapperMock.expects("getLogger").once(); const res: typeof bas = eventMock.expects("getExtension").withExactArgs("SAPOSS.app-studio-toolkit")?.exports; vscodeEventMock.expects("setBasAPI").withExactArgs(res); - extension.activate(testContext); + await extension.activate(testContext); expect(_.size(_.keys(oRegisteredCommands))).to.be.equal(2); expect( _.get(oRegisteredCommands, "loadGuidedDevelopment")).to.be.not.undefined; expect(_.get(oRegisteredCommands, "guidedDevelopment.toggleOutput")).to.be.not.undefined; }); - it("logger failure on extenion activation", () => { + it("logger failure on extenion activation", async () => { const consoleMock = sandbox.mock(console); loggerWrapperMock.expects("createExtensionLoggerAndSubscribeToLogSettingsChanges").throws(new Error("activation error")); consoleMock.expects("error").withExactArgs('Extension activation failed due to Logger configuration failure:', "activation error"); - extension.activate(null); + await extension.activate(null); }); });