Skip to content

Commit 21f83a6

Browse files
authored
Test cleanup: Create indexeddbshim SQLite files in a temporary directory now that indexeddbshim/IndexedDBShim#319 is fixed. (#781)
1 parent 84686ba commit 21f83a6

File tree

4 files changed

+9
-32
lines changed

4 files changed

+9
-32
lines changed

packages/firestore/.gitignore

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

packages/firestore/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"@types/mocha": "5.0.0",
4141
"@types/sinon": "4.3.1",
4242
"chai": "4.1.2",
43-
"indexeddbshim":"3.6.1",
43+
"indexeddbshim":"3.6.2",
4444
"karma": "2.0.0",
4545
"karma-chrome-launcher": "2.2.0",
4646
"karma-cli": "1.0.1",
@@ -53,7 +53,6 @@
5353
"long": "3.2.0",
5454
"mkdirp": "0.5.1",
5555
"mocha": "5.0.5",
56-
"node-cleanup": "2.1.2",
5756
"npm-run-all": "4.1.2",
5857
"nyc": "11.6.0",
5958
"rollup": "0.57.1",

packages/firestore/test/util/node_persistence.ts

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import * as registerIndexedDBShim from 'indexeddbshim';
1818
import * as fs from 'fs';
19-
import * as nodeCleanup from 'node-cleanup';
19+
import * as os from 'os';
2020

2121
// WARNING: The `indexeddbshim` installed via this module should only ever be
2222
// used during initial development. Always validate your changes via
@@ -28,29 +28,15 @@ import * as nodeCleanup from 'node-cleanup';
2828

2929
const globalAny = global as any; // tslint:disable-line:no-any
3030

31+
const dbDir = fs.mkdtempSync(os.tmpdir() + '/firestore_tests');
32+
3133
if (process.env.USE_MOCK_PERSISTENCE === 'YES') {
3234
registerIndexedDBShim(null, {
3335
checkOrigin: false,
36+
databaseBasePath: dbDir,
3437
deleteDatabaseFiles: true
3538
});
3639
globalAny.window = Object.assign(globalAny.window || {}, {
3740
indexedDB: globalAny.indexedDB
3841
});
39-
}
40-
41-
// `deleteDatabaseFiles` does not reliable delete all SQLite files. Before
42-
// we exit the Node process, we attempt to delete all lingering "*.sqllite"
43-
// files.
44-
const existingFiles = new Set<string>();
45-
46-
fs.readdirSync('.').forEach(file => {
47-
existingFiles.add(file);
48-
});
49-
50-
nodeCleanup(() => {
51-
fs.readdirSync('.').forEach(file => {
52-
if (file.endsWith('.sqlite') && !existingFiles.has(file)) {
53-
fs.unlinkSync(file);
54-
}
55-
});
56-
});
42+
}

yarn.lock

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4991,9 +4991,9 @@ indent-string@^3.0.0:
49914991
version "3.2.0"
49924992
resolved "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
49934993

4994-
4995-
version "3.6.1"
4996-
resolved "https://registry.npmjs.org/indexeddbshim/-/indexeddbshim-3.6.1.tgz#a0eff29ebfd4b46b5c914dd32e2306d8bc7dd8fe"
4994+
4995+
version "3.6.2"
4996+
resolved "https://registry.npmjs.org/indexeddbshim/-/indexeddbshim-3.6.2.tgz#281fe257595e96fec242f00639f4ce66855cda32"
49974997
dependencies:
49984998
babel-polyfill "6.26.0"
49994999
eventtargeter "0.4.0"
@@ -7160,10 +7160,6 @@ nise@^1.2.0:
71607160
path-to-regexp "^1.7.0"
71617161
text-encoding "^0.6.4"
71627162

7163-
7164-
version "2.1.2"
7165-
resolved "https://registry.npmjs.org/node-cleanup/-/node-cleanup-2.1.2.tgz#7ac19abd297e09a7f72a71545d951b517e4dde2c"
7166-
71677163
71687164
version "2.1.2"
71697165
resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.1.2.tgz#ab884e8e7e57e38a944753cec706f788d1768bb5"

0 commit comments

Comments
 (0)