Skip to content

Commit 0ec5580

Browse files
ole1986ole1986
authored
Fixed package testing (#665)
* Fixed testing
1 parent 6d5d225 commit 0ec5580

File tree

8 files changed

+41742
-9381
lines changed

8 files changed

+41742
-9381
lines changed

‎build/postInstall.js‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎package-lock.json‎

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

‎package.json‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,6 @@
411411
"test-extension": "node ./dist/test/runTest.js",
412412
"webpack": "webpack -p --progress --colors",
413413
"webpack-dev": "webpack --progress --colors --watch",
414-
"postinstall": "node ./node_modules/vscode/bin/install && node ./build/postInstall.js",
415414
"lint": "eslint 'src/**/*.ts' && eslint 'browser/src/**/*.ts*'",
416415
"fix": "eslint --fix \"src/**/*.ts\" && eslint --fix \"browser/src/**/*.ts*\"",
417416
"precommit": "lint-staged",
@@ -427,11 +426,11 @@
427426
]
428427
},
429428
"devDependencies": {
430-
"@storybook/addon-actions": "^5.3.17",
429+
"@storybook/addon-actions": "^6.3.2",
431430
"@storybook/addon-info": "^5.3.17",
432431
"@storybook/addon-links": "^5.3.17",
433432
"@storybook/addons": "^5.3.17",
434-
"@storybook/react": "^5.3.17",
433+
"@storybook/react": "^3.4.12",
435434
"@types/chai": "^4.2.9",
436435
"@types/clipboard": "^2.0.1",
437436
"@types/fs-extra": "^8.0.0",
@@ -450,6 +449,7 @@
450449
"@types/react-router-dom": "^5.1.3",
451450
"@types/react-router-redux": "^5.0.18",
452451
"@types/redux-actions": "^2.2.2",
452+
"@types/vscode": "^1.46.0",
453453
"@typescript-eslint/eslint-plugin": "^2.21.0",
454454
"@typescript-eslint/parser": "^2.21.0",
455455
"axios": "^0.21.1",
@@ -499,8 +499,7 @@
499499
"tsconfig-paths-webpack-plugin": "^3.2.0",
500500
"typemoq": "^2.1.0",
501501
"typescript": "^3.8.2",
502-
"vscode": "^1.1.36",
503-
"vscode-test": "^1.3.0",
502+
"vscode-test": "^1.5.2",
504503
"webpack": "4.41.6",
505504
"webpack-cli": "^3.3.11"
506505
},

‎src/application/types/workspace.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export interface IWorkspaceService {
1919
*
2020
* @readonly
2121
*/
22-
readonly workspaceFolders: WorkspaceFolder[] | undefined;
22+
readonly workspaceFolders: ReadonlyArray<WorkspaceFolder> | undefined;
2323

2424
/**
2525
* An event that is emitted when a workspace folder is added or removed.

‎src/application/workspace.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export class WorkspaceService implements IWorkspaceService {
2121
public get onDidChangeConfiguration(): Event<ConfigurationChangeEvent> {
2222
return workspace.onDidChangeConfiguration;
2323
}
24-
public get workspaceFolders(): WorkspaceFolder[] | undefined {
24+
public get workspaceFolders(): ReadonlyArray<WorkspaceFolder> | undefined {
2525
return workspace.workspaceFolders;
2626
}
2727
public get onDidChangeWorkspaceFolders(): Event<WorkspaceFoldersChangeEvent> {

‎src/viewers/commitViewer.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import { ICommitViewer } from './types';
1414
export class CommitViewer implements ICommitViewer, TreeDataProvider<DirectoryNode | FileNode> {
1515
private registered = false;
1616
private commit?: CommitDetails;
17-
private _onDidChangeTreeData = new EventEmitter<DirectoryNode | FileNode>();
17+
private _onDidChangeTreeData = new EventEmitter<DirectoryNode | FileNode | undefined>();
1818
private fileView = false;
19-
public get onDidChangeTreeData(): Event<DirectoryNode | FileNode> {
19+
public get onDidChangeTreeData(): Event<DirectoryNode | FileNode | undefined> {
2020
return this._onDidChangeTreeData.event;
2121
}
2222
public get selectedCommit(): Readonly<CommitDetails> {
@@ -37,7 +37,7 @@ export class CommitViewer implements ICommitViewer, TreeDataProvider<DirectoryNo
3737
this.registered = true;
3838
window.registerTreeDataProvider(this.treeId, this);
3939
}
40-
this._onDidChangeTreeData.fire();
40+
this._onDidChangeTreeData.fire(undefined);
4141
this.commandManager.executeCommand('setContext', this.visibilityContextVariable, true);
4242
}
4343
public showCommit(commit: CommitDetails): void {
@@ -47,11 +47,11 @@ export class CommitViewer implements ICommitViewer, TreeDataProvider<DirectoryNo
4747
}
4848
public showFilesView(): void {
4949
this.fileView = true;
50-
this._onDidChangeTreeData.fire();
50+
this._onDidChangeTreeData.fire(undefined);
5151
}
5252
public showFolderView(): void {
5353
this.fileView = false;
54-
this._onDidChangeTreeData.fire();
54+
this._onDidChangeTreeData.fire(undefined);
5555
}
5656
public async getTreeItem(element: DirectoryNode | FileNode): Promise<TreeItem> {
5757
const treeItem = await this.nodeBuilder.getTreeItem(element);

‎test/non-extension/__mocks__/vsc/extHostedTypes.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2089,7 +2089,7 @@ export namespace vscMockExtHostedTypes {
20892089
Expanded = 1
20902090
}
20912091

2092-
export class QuickInputButtons {
2093-
static readonly Back: vscode.QuickInputButton = { iconPath: 'back' };
2094-
}
2092+
/* export class QuickInputButtons {
2093+
static readonly Back: vscode.QuickInputButton = { iconPath: 'back' };
2094+
}*/
20952095
}

‎test/non-extension/__mocks__/vscode-mock.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ mockedVSCode.Disposable = vscodeMocks.vscMock.Disposable as any;
5151
mockedVSCode.CodeAction = vscodeMocks.vscMock.CodeAction;
5252
mockedVSCode.EventEmitter = vscodeMocks.vscMock.EventEmitter;
5353
mockedVSCode.CancellationTokenSource = vscodeMocks.vscMock.CancellationTokenSource;
54-
mockedVSCode.CompletionItemKind = vscodeMocks.vscMock.CompletionItemKind;
54+
// mockedVSCode.CompletionItemKind = vscodeMocks.vscMock.CompletionItemKind;
5555
mockedVSCode.SymbolKind = vscodeMocks.vscMock.SymbolKind;
5656
mockedVSCode.IndentAction = vscodeMocks.vscMock.IndentAction;
5757
mockedVSCode.Uri = vscodeMocks.vscUri.URI as any;
@@ -61,7 +61,7 @@ mockedVSCode.Selection = vscodeMocks.vscMockExtHostedTypes.Selection;
6161
mockedVSCode.Location = vscodeMocks.vscMockExtHostedTypes.Location;
6262
mockedVSCode.SymbolInformation = vscodeMocks.vscMockExtHostedTypes.SymbolInformation;
6363
mockedVSCode.CompletionItem = vscodeMocks.vscMockExtHostedTypes.CompletionItem;
64-
mockedVSCode.CompletionItemKind = vscodeMocks.vscMockExtHostedTypes.CompletionItemKind;
64+
// mockedVSCode.CompletionItemKind = vscodeMocks.vscMockExtHostedTypes.CompletionItemKind;
6565
mockedVSCode.CodeLens = vscodeMocks.vscMockExtHostedTypes.CodeLens;
6666
mockedVSCode.DiagnosticSeverity = vscodeMocks.vscMockExtHostedTypes.DiagnosticSeverity;
6767
mockedVSCode.SnippetString = vscodeMocks.vscMockExtHostedTypes.SnippetString;
@@ -80,9 +80,9 @@ mockedVSCode.TreeItemCollapsibleState = vscodeMocks.vscMockExtHostedTypes.TreeIt
8080
mockedVSCode.CodeActionKind = vscodeMocks.vscMock.CodeActionKind;
8181
mockedVSCode.DebugAdapterExecutable = vscodeMocks.vscMock.DebugAdapterExecutable;
8282
mockedVSCode.DebugAdapterServer = vscodeMocks.vscMock.DebugAdapterServer;
83-
mockedVSCode.QuickInputButtons = vscodeMocks.vscMockExtHostedTypes.QuickInputButtons;
83+
// mockedVSCode.QuickInputButtons = vscodeMocks.vscMockExtHostedTypes.QuickInputButtons;
8484
mockedVSCode.FileType = vscodeMocks.vscMock.FileType;
85-
mockedVSCode.FileSystemError = vscodeMocks.vscMockExtHostedTypes.FileSystemError;
85+
// mockedVSCode.FileSystemError = vscodeMocks.vscMockExtHostedTypes.FileSystemError;
8686

8787
// This API is used in src/client/telemetry/telemetry.ts
8888
const extensions = TypeMoq.Mock.ofType<typeof vscode.extensions>();

0 commit comments

Comments
 (0)