mirror of
https://github.com/gristlabs/grist-core.git
synced 2026-03-02 04:09:24 +00:00
remove stray redis dependency, and upgrade node in tests (#173)
* remove stray redis dependency in test * tweak handling of database connection between tests * upgrade node versions in tests, type guessing in node 10 has problems
This commit is contained in:
@@ -23,6 +23,7 @@ import {driver, IMochaServer, WebDriver} from 'mocha-webdriver';
|
||||
import fetch from 'node-fetch';
|
||||
import {tmpdir} from 'os';
|
||||
import * as path from 'path';
|
||||
import {removeConnection} from 'test/gen-server/seed';
|
||||
import {HomeUtil} from 'test/nbrowser/homeUtil';
|
||||
|
||||
export class TestServerMerged implements IMochaServer {
|
||||
@@ -38,7 +39,7 @@ export class TestServerMerged implements IMochaServer {
|
||||
private _server: ChildProcess;
|
||||
private _exitPromise: Promise<number|string>;
|
||||
private _starts: number = 0;
|
||||
private _dbManager: HomeDBManager;
|
||||
private _dbManager?: HomeDBManager;
|
||||
private _driver: WebDriver;
|
||||
|
||||
// The name is used to name the directory for server logs and data.
|
||||
@@ -244,6 +245,11 @@ export class TestServerMerged implements IMochaServer {
|
||||
return this._dbManager;
|
||||
}
|
||||
|
||||
public async closeDatabase() {
|
||||
this._dbManager = undefined;
|
||||
await removeConnection();
|
||||
}
|
||||
|
||||
public get driver() {
|
||||
return this._driver || driver;
|
||||
}
|
||||
|
||||
@@ -98,6 +98,10 @@ export function setupTestSuite(options?: TestSuiteOptions) {
|
||||
// always call resume.
|
||||
afterEach(() => server.resume());
|
||||
|
||||
// Close database until next test explicitly needs it, to avoid conflicts
|
||||
// with tests that don't use the same server.
|
||||
after(async () => server.closeDatabase());
|
||||
|
||||
return setupRequirement({team: true, ...options});
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user