Combine beforeEach

Author: norascheuch

extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/remote-query-history.test.ts

@@ -58,6 +58,7 @@ describe('Remote queries and query history manager', function() {
     await copyHistoryState();
 
     sandbox = sinon.createSandbox();
+    disposables = new DisposableBucket();
 
     localQueriesResultsViewStub = {
       showResults: sandbox.stub()
@@ -81,19 +82,6 @@ describe('Remote queries and query history manager', function() {
       onVariantAnalysisStatusUpdated: sandbox.stub(),
       onVariantAnalysisRemoved: sandbox.stub()
     } as any as VariantAnalysisManager;
-  });
-
-  afterEach(function() {
-    // set a higher timeout since recursive delete below may take a while, expecially on Windows.
-    this.timeout(120000);
-    deleteHistoryState();
-    disposables.dispose(testDisposeHandler);
-    sandbox.restore();
-  });
-
-  beforeEach(() => {
-    sandbox = sinon.createSandbox();
-    disposables = new DisposableBucket();
 
     rawQueryHistory = fs.readJSONSync(path.join(STORAGE_DIR, 'workspace-query-history.json')).queries;
     remoteQueryResult0 = fs.readJSONSync(path.join(STORAGE_DIR, 'queries', rawQueryHistory[0].queryId, 'query-result.json'));
@@ -123,6 +111,14 @@ describe('Remote queries and query history manager', function() {
     openTextDocumentSpy = sandbox.spy(workspace, 'openTextDocument');
   });
 
+  afterEach(function() {
+    // set a higher timeout since recursive delete below may take a while, expecially on Windows.
+    this.timeout(120000);
+    deleteHistoryState();
+    disposables.dispose(testDisposeHandler);
+    sandbox.restore();
+  });
+
   it('should read query history', async () => {
     await qhm.readQueryHistory();