From 6b657259a536ff340f5364adaa2dbd67c907ab00 Mon Sep 17 00:00:00 2001
From: Chris LaFreniere <40371649+chlafreniere@users.noreply.github.com>
Date: Fri, 13 Nov 2020 11:16:14 -0800
Subject: [PATCH] Ensure that we close editors before utils tests (#13391)

---
 extensions/notebook/src/book/bookTreeView.ts           |  2 +-
 .../notebook/src/test/common/notebookUtils.test.ts     | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/extensions/notebook/src/book/bookTreeView.ts b/extensions/notebook/src/book/bookTreeView.ts
index f3d9eb85a8..0416a63109 100644
--- a/extensions/notebook/src/book/bookTreeView.ts
+++ b/extensions/notebook/src/book/bookTreeView.ts
@@ -328,7 +328,7 @@ export class BookTreeViewProvider implements vscode.TreeDataProvider<BookTreeIte
 		if (shouldReveal || this._bookViewer?.visible) {
 			bookItem = notebookPath ? await this.findAndExpandParentNode(notebookPath) : undefined;
 			// 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
 				await this._bookViewer.reveal(bookItem, { select: true, focus: true, expand: true });
 			}
diff --git a/extensions/notebook/src/test/common/notebookUtils.test.ts b/extensions/notebook/src/test/common/notebookUtils.test.ts
index ef88ca59b9..6d18b4d986 100644
--- a/extensions/notebook/src/test/common/notebookUtils.test.ts
+++ b/extensions/notebook/src/test/common/notebookUtils.test.ts
@@ -20,14 +20,18 @@ describe('notebookUtils Tests', function (): void {
 	let notebookUtils: NotebookUtils = new NotebookUtils();
 	let showErrorMessageSpy: sinon.SinonSpy;
 
-	beforeEach(function(): void {
+	beforeEach(function (): void {
 		showErrorMessageSpy = sinon.spy(vscode.window, 'showErrorMessage');
 	});
 
-	afterEach(function(): void {
+	afterEach(function (): void {
 		sinon.restore();
 	});
 
+	this.beforeAll(async function (): Promise<void> {
+		await vscode.commands.executeCommand('workbench.action.closeAllEditors');
+	});
+
 	this.afterAll(async function (): Promise<void> {
 		await vscode.commands.executeCommand('workbench.action.closeAllEditors');
 	});
@@ -109,7 +113,7 @@ describe('notebookUtils Tests', function (): void {
 			sinon.replaceGetter(azdata.nb, 'activeNotebookEditor', () => undefined);
 			await notebookUtils.clearActiveCellOutput();
 			should(showErrorMessageSpy.calledOnce).be.true('showErrorMessage should be called exactly once');
-});
+		});
 
 		it('does not show error when notebook visible', async function (): Promise<void> {
 			let mockNotebookEditor = TypeMoq.Mock.ofType<azdata.nb.NotebookEditor>();