Skip to content

Commit ef983f4

Browse files
authored
Bump vscode-tas-client and fix tests (microsoft#22493)
Closes microsoft#22461 Sinon requires the actual object definition, so we need to point it to the module file that actually has the function.
1 parent 9298b2c commit ef983f4

File tree

3 files changed

+52
-56
lines changed

3 files changed

+52
-56
lines changed

package-lock.json

Lines changed: 45 additions & 51 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1588,7 +1588,7 @@
15881588
"vscode-jsonrpc": "^8.2.0",
15891589
"vscode-languageclient": "^9.0.1",
15901590
"vscode-languageserver-protocol": "^3.17.5",
1591-
"vscode-tas-client": "^0.1.63",
1591+
"vscode-tas-client": "^0.1.75",
15921592
"which": "^2.0.2",
15931593
"winreg": "^1.2.4",
15941594
"xml2js": "^0.5.0"

src/test/common/experiments/service.unit.test.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ import { assert } from 'chai';
88
import * as sinon from 'sinon';
99
import { anything, instance, mock, when } from 'ts-mockito';
1010
import { Disposable } from 'vscode-jsonrpc';
11-
import * as tasClient from 'vscode-tas-client';
11+
// sinon can not create a stub if we just point to the exported module
12+
import * as tasClient from 'vscode-tas-client/vscode-tas-client/VSCodeTasClient';
13+
import * as expService from 'vscode-tas-client';
1214
import { ApplicationEnvironment } from '../../../client/common/application/applicationEnvironment';
1315
import { IApplicationEnvironment, IWorkspaceService } from '../../../client/common/application/types';
1416
import { WorkspaceService } from '../../../client/common/application/workspace';
@@ -180,7 +182,7 @@ suite('Experimentation service', () => {
180182
getTreatmentVariable = sinon.stub().returns(true);
181183
sinon.stub(tasClient, 'getExperimentationService').returns(({
182184
getTreatmentVariable,
183-
} as unknown) as tasClient.IExperimentationService);
185+
} as unknown) as expService.IExperimentationService);
184186

185187
configureApplicationEnvironment('stable', extensionVersion);
186188
});
@@ -218,7 +220,7 @@ suite('Experimentation service', () => {
218220
getTreatmentVariable = sinon.stub().returns(false);
219221
sinon.stub(tasClient, 'getExperimentationService').returns(({
220222
getTreatmentVariable,
221-
} as unknown) as tasClient.IExperimentationService);
223+
} as unknown) as expService.IExperimentationService);
222224

223225
configureApplicationEnvironment('stable', extensionVersion);
224226

@@ -364,7 +366,7 @@ suite('Experimentation service', () => {
364366
getTreatmentVariableStub = sinon.stub().returns(Promise.resolve('value'));
365367
sinon.stub(tasClient, 'getExperimentationService').returns(({
366368
getTreatmentVariable: getTreatmentVariableStub,
367-
} as unknown) as tasClient.IExperimentationService);
369+
} as unknown) as expService.IExperimentationService);
368370

369371
configureApplicationEnvironment('stable', extensionVersion);
370372
});

0 commit comments

Comments
 (0)