mirror of
https://github.com/Microsoft/vscode
synced 2024-10-13 06:48:17 +00:00
Fix tests
This commit is contained in:
parent
ed2bbf3ac0
commit
99ba40165b
|
@ -39,7 +39,7 @@ export class TestExtensionEnablementService extends ExtensionEnablementService {
|
|||
{ onDidUninstallExtension: new Emitter<DidUninstallExtensionEvent>().event } as IExtensionManagementService));
|
||||
}
|
||||
|
||||
public reset(): Promise<void> {
|
||||
public async reset(): Promise<void> {
|
||||
return this.getDisabledExtensions().then(extensions => extensions.forEach(d => this.setEnablement(aLocalExtension(d.id), EnablementState.Enabled)));
|
||||
}
|
||||
}
|
||||
|
@ -370,6 +370,7 @@ function aLocalExtension(id: string, contributes?: IExtensionContributions): ILo
|
|||
const [publisher, name] = id.split('.');
|
||||
return <ILocalExtension>Object.create({
|
||||
identifier: { id },
|
||||
galleryIdentifier: { id, uuid: void 0 },
|
||||
manifest: {
|
||||
name,
|
||||
publisher,
|
||||
|
|
|
@ -16,7 +16,7 @@ import {
|
|||
IExtensionManagementService, IExtensionGalleryService, IExtensionEnablementService, IExtensionTipsService, ILocalExtension, LocalExtensionType, IGalleryExtension,
|
||||
DidInstallExtensionEvent, DidUninstallExtensionEvent, InstallExtensionEvent, IExtensionIdentifier, EnablementState, InstallOperation, IExtensionManagementServerService, IExtensionManagementServer
|
||||
} from 'vs/platform/extensionManagement/common/extensionManagement';
|
||||
import { getGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
|
||||
import { getGalleryExtensionId, getGalleryExtensionIdFromLocal } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
|
||||
import { ExtensionManagementService, getLocalExtensionIdFromGallery, getLocalExtensionIdFromManifest } from 'vs/platform/extensionManagement/node/extensionManagementService';
|
||||
import { ExtensionTipsService } from 'vs/workbench/parts/extensions/electron-browser/extensionTipsService';
|
||||
import { TestExtensionEnablementService } from 'vs/platform/extensionManagement/test/common/extensionEnablementService.test';
|
||||
|
@ -79,12 +79,12 @@ suite('ExtensionsActions Test', () => {
|
|||
instantiationService.stub(IURLService, URLService);
|
||||
});
|
||||
|
||||
setup(() => {
|
||||
setup(async () => {
|
||||
instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', []);
|
||||
instantiationService.stubPromise(IExtensionManagementService, 'getExtensionsReport', []);
|
||||
instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage());
|
||||
instantiationService.stub(IExtensionService, { getExtensions: () => TPromise.wrap([]) });
|
||||
(<TestExtensionEnablementService>instantiationService.get(IExtensionEnablementService)).reset();
|
||||
await (<TestExtensionEnablementService>instantiationService.get(IExtensionEnablementService)).reset();
|
||||
|
||||
instantiationService.set(IExtensionsWorkbenchService, instantiationService.createInstance(ExtensionsWorkbenchService));
|
||||
});
|
||||
|
@ -1207,6 +1207,7 @@ suite('ExtensionsActions Test', () => {
|
|||
assign(localExtension.manifest, { name, publisher: 'pub', version: '1.0.0' }, manifest);
|
||||
localExtension.identifier = { id: getLocalExtensionIdFromManifest(localExtension.manifest) };
|
||||
localExtension.metadata = { id: localExtension.identifier.id, publisherId: localExtension.manifest.publisher, publisherDisplayName: 'somename' };
|
||||
localExtension.galleryIdentifier = { id: getGalleryExtensionIdFromLocal(localExtension), uuid: void 0 };
|
||||
return localExtension;
|
||||
}
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@ import {
|
|||
IExtensionManagementService, IExtensionGalleryService, IExtensionEnablementService, IExtensionTipsService, ILocalExtension, LocalExtensionType, IGalleryExtension,
|
||||
DidInstallExtensionEvent, DidUninstallExtensionEvent, InstallExtensionEvent, IGalleryExtensionAssets, IExtensionIdentifier, EnablementState, InstallOperation
|
||||
} from 'vs/platform/extensionManagement/common/extensionManagement';
|
||||
import { getGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
|
||||
import { getGalleryExtensionId, getGalleryExtensionIdFromLocal } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
|
||||
import { ExtensionManagementService, getLocalExtensionIdFromGallery, getLocalExtensionIdFromManifest } from 'vs/platform/extensionManagement/node/extensionManagementService';
|
||||
import { ExtensionTipsService } from 'vs/workbench/parts/extensions/electron-browser/extensionTipsService';
|
||||
import { TestExtensionEnablementService } from 'vs/platform/extensionManagement/test/common/extensionEnablementService.test';
|
||||
|
@ -82,13 +82,13 @@ suite('ExtensionsWorkbenchServiceTest', () => {
|
|||
instantiationService.stub(IDialogService, { show: () => TPromise.as(0) });
|
||||
});
|
||||
|
||||
setup(() => {
|
||||
setup(async () => {
|
||||
instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', []);
|
||||
instantiationService.stubPromise(IExtensionManagementService, 'getExtensionsReport', []);
|
||||
instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage());
|
||||
instantiationService.stub(IDialogService, { show: () => TPromise.as(0) });
|
||||
instantiationService.stubPromise(INotificationService, 'prompt', 0);
|
||||
(<TestExtensionEnablementService>instantiationService.get(IExtensionEnablementService)).reset();
|
||||
await (<TestExtensionEnablementService>instantiationService.get(IExtensionEnablementService)).reset();
|
||||
});
|
||||
|
||||
teardown(() => {
|
||||
|
@ -1238,6 +1238,7 @@ suite('ExtensionsWorkbenchServiceTest', () => {
|
|||
assign(localExtension.manifest, { name, publisher: 'pub', version: '1.0.0' }, manifest);
|
||||
localExtension.identifier = { id: getLocalExtensionIdFromManifest(localExtension.manifest) };
|
||||
localExtension.metadata = { id: localExtension.identifier.id, publisherId: localExtension.manifest.publisher, publisherDisplayName: 'somename' };
|
||||
localExtension.galleryIdentifier = { id: getGalleryExtensionIdFromLocal(localExtension), uuid: void 0 };
|
||||
return localExtension;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue