ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Ensure that we close editors before utils tests (#13391)

Browse Source
This commit is contained in:
Chris LaFreniere
2020-11-13 11:16:14 -08:00
committed by GitHub
parent cbe2ba0901
commit 6b657259a5
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/notebook/src/book/bookTreeView.ts
View File

@@ -328,7 +328,7 @@ export class BookTreeViewProvider implements vscode.TreeDataProvider<BookTreeIte
if (shouldReveal || this._bookViewer?.visible) { if (shouldReveal || this._bookViewer?.visible) {
bookItem = notebookPath ? await this.findAndExpandParentNode(notebookPath) : undefined; bookItem = notebookPath ? await this.findAndExpandParentNode(notebookPath) : undefined;
// Select + focus item in viewlet if books viewlet is already open, or if we pass in variable // Select + focus item in viewlet if books viewlet is already open, or if we pass in variable
if (bookItem?.contextValue !== 'pinnedNotebook') { if (bookItem?.contextValue && bookItem.contextValue !== 'pinnedNotebook') {
// Note: 3 is the maximum number of levels that the vscode APIs let you expand to // Note: 3 is the maximum number of levels that the vscode APIs let you expand to
await this._bookViewer.reveal(bookItem, { select: true, focus: true, expand: true }); await this._bookViewer.reveal(bookItem, { select: true, focus: true, expand: true });
} }

10
extensions/notebook/src/test/common/notebookUtils.test.ts
View File

@@ -20,14 +20,18 @@ describe('notebookUtils Tests', function (): void {
let notebookUtils: NotebookUtils = new NotebookUtils(); let notebookUtils: NotebookUtils = new NotebookUtils();
let showErrorMessageSpy: sinon.SinonSpy; let showErrorMessageSpy: sinon.SinonSpy;
beforeEach(function(): void { beforeEach(function (): void {
showErrorMessageSpy = sinon.spy(vscode.window, 'showErrorMessage'); showErrorMessageSpy = sinon.spy(vscode.window, 'showErrorMessage');
}); });
afterEach(function(): void { afterEach(function (): void {
sinon.restore(); sinon.restore();
}); });
this.beforeAll(async function (): Promise<void> {
await vscode.commands.executeCommand('workbench.action.closeAllEditors');
});
this.afterAll(async function (): Promise<void> { this.afterAll(async function (): Promise<void> {
await vscode.commands.executeCommand('workbench.action.closeAllEditors'); await vscode.commands.executeCommand('workbench.action.closeAllEditors');
}); });
@@ -109,7 +113,7 @@ describe('notebookUtils Tests', function (): void {
sinon.replaceGetter(azdata.nb, 'activeNotebookEditor', () => undefined); sinon.replaceGetter(azdata.nb, 'activeNotebookEditor', () => undefined);
await notebookUtils.clearActiveCellOutput(); await notebookUtils.clearActiveCellOutput();
should(showErrorMessageSpy.calledOnce).be.true('showErrorMessage should be called exactly once'); should(showErrorMessageSpy.calledOnce).be.true('showErrorMessage should be called exactly once');
}); });
it('does not show error when notebook visible', async function (): Promise<void> { it('does not show error when notebook visible', async function (): Promise<void> {
let mockNotebookEditor = TypeMoq.Mock.ofType<azdata.nb.NotebookEditor>(); let mockNotebookEditor = TypeMoq.Mock.ofType<azdata.nb.NotebookEditor>();