Use patched version of tmp + avoid using promisifyAll

promisifyAll alters the prototype of the passed object, which can lead
to errors while executing the test case unitary.

Instead use the already imported library tmp-promise

Author: fflorent

app/server/declarations/tmp.d.ts

@@ -148,7 +148,6 @@ import * as moment from 'moment-timezone';
 import fetch from 'node-fetch';
 import stream from 'node:stream';
 import path from 'path';
-import tmp from 'tmp';
 
 import {ActionHistory} from './ActionHistory';
 import {ActionHistoryImpl} from './ActionHistoryImpl';
@@ -172,8 +171,6 @@ import sum = require('lodash/sum');
 import throttle = require('lodash/throttle');
 import without = require('lodash/without');
 
-bluebird.promisifyAll(tmp);
-
 const MAX_RECENT_ACTIONS = 100;
 
 const DEFAULT_TIMEZONE = (process.versions as any).electron ? moment.tz.guess() : "UTC";

app/server/lib/ActiveDoc.ts

@@ -16,13 +16,9 @@ import { GristServer } from 'app/server/lib/GristServer';
 import log from 'app/server/lib/log';
 import { SafePythonComponent } from 'app/server/lib/SafePythonComponent';
 import { UnsafeNodeComponent } from 'app/server/lib/UnsafeNodeComponent';
-import { promisifyAll } from 'bluebird';
 import * as fse from 'fs-extra';
 import * as path from 'path';
-import tmp from 'tmp';
-
-
-promisifyAll(tmp);
+import * as tmp from 'tmp-promise';
 
 /**
  * Implements GristDocAPI interface.
@@ -196,7 +192,7 @@ export class DocPluginManager {
   }
 
   private async _initialize(): Promise<void> {
-    this._tmpDir = await tmp.dirAsync({ prefix: 'grist-tmp-', unsafeCleanup: true });
+    this._tmpDir = (await tmp.dir({ prefix: 'grist-tmp-', unsafeCleanup: true })).path;
     for (const plugin of this._localPlugins) {
       try {
         // todo: once Comm has been replaced by grain-rpc, pluginInstance.rpc should forward '*' to client

app/server/lib/DocPluginManager.ts

@@ -213,7 +213,7 @@
     "slugify": "1.6.6",
     "swagger-ui-dist": "5.11.0",
     "tar-stream": "^3.1.7",
-    "tmp": "0.2.4",
+    "tmp": "https://github.com/fflorent/node-tmp#fix-tmp-dir-with-dir",
     "tmp-promise": "1.0.5",
     "ts-interface-checker": "1.0.2",
     "typeorm": "0.3.17",

package.json

@@ -17,7 +17,7 @@ import {assert} from 'chai';
 import * as fse from 'fs-extra';
 import {tmpdir} from 'os';
 import * as path from 'path';
-import * as tmp from 'tmp';
+import * as tmp from 'tmp-promise';
 
 tmp.setGracefulCleanup();
 
@@ -168,12 +168,12 @@ export async function createDocManager(
 export async function createTmpDir(): Promise<string> {
   const tmpRootDir = process.env.TESTDIR || tmpdir();
   await fse.mkdirs(tmpRootDir);
-  return fse.realpath(await tmp.dirAsync({
+  return (await tmp.dir({
     dir: tmpRootDir,
     prefix: 'grist_test_',
     unsafeCleanup: true,
     keep: noCleanup,
-  }));
+  })).path;
 }
 
 /**

stubs/app/server/tmp.d.ts

@@ -1,12 +1,10 @@
 const assert  = require('chai').assert;
 const child_process = require('child_process');
 const fs      = require('fs');
-const tmp     = require('tmp');
 
 const Promise = require('bluebird');
 Promise.promisifyAll(child_process);
 Promise.promisifyAll(fs);
-Promise.promisifyAll(tmp);
 
 const {ActionHistoryImpl} = require('app/server/lib/ActionHistoryImpl');
 const {DocStorage}        = require('app/server/lib/DocStorage');
@@ -15,8 +13,6 @@ const marshal             = require('app/common/marshal');
 const {createDocTools}    = require('test/server/docTools');
 const testUtils           = require('test/server/testUtils');
 
-tmp.setGracefulCleanup();
-
 describe('DocStorage', function() {
 
   var docStorageManager;

test/server/docTools.ts

@@ -3,7 +3,7 @@
 import {assert} from 'chai';
 import * as fse from 'fs-extra';
 import * as path from 'path';
-import * as tmp from 'tmp';
+import * as tmp from 'tmp-promise';
 
 import {DocStorageManager} from 'app/server/lib/DocStorageManager';
 import * as docUtils from 'app/server/lib/docUtils';
@@ -17,7 +17,7 @@ describe('DocStorageManager', function() {
   let docsRoot: string;
   let docStorageManager: DocStorageManager;
   before(async function() {
-    const tmpDir = await tmp.dirAsync({ prefix: 'grist_test_', unsafeCleanup: true });
+    const tmpDir = (await tmp.dir({ prefix: 'grist_test_', unsafeCleanup: true })).path;
     docsRoot = fse.realpathSync(tmpDir);
     docStorageManager = new DocStorageManager(docsRoot);
   });

test/server/lib/DocStorage.js

@@ -7,7 +7,7 @@ import * as fse from 'fs-extra';
 import * as path from 'path';
 import * as testUtils from 'test/server/testUtils';
 import {assert} from 'test/server/testUtils';
-import * as tmp from 'tmp';
+import * as tmp from 'tmp-promise';
 
 tmp.setGracefulCleanup();
 const execFileAsync = promisify(child_process.execFile);
@@ -20,7 +20,7 @@ describe('DocStorageMigrations', function() {
 
   before(async function() {
     // Set Grist home to a temporary directory, and wipe it out on exit.
-    let tmpDir = await tmp.dirAsync({ prefix: 'grist_test_', unsafeCleanup: true });
+    let tmpDir = (await tmp.dir({ prefix: 'grist_test_', unsafeCleanup: true })).path;
     tmpDir = await fse.realpath(tmpDir);
     docStorageManager = new DocStorageManager(tmpDir);
   });

test/server/lib/DocStorageManager.ts

@@ -2,7 +2,7 @@ import {assert} from 'chai';
 import * as fse from 'fs-extra';
 import {map, noop} from 'lodash';
 import {join as pathJoin} from 'path';
-import * as tmp from 'tmp';
+import * as tmp from 'tmp-promise';
 
 import {delay} from 'app/common/delay';
 import {OpenMode, SchemaInfo, SQLiteDB} from 'app/server/lib/SQLiteDB';
@@ -13,17 +13,18 @@ tmp.setGracefulCleanup();
 
 describe('SQLiteDB', function() {
   let tmpDir: string;
+  let cleanup: () => void;
 
   // Turn off logging for this test, and restore afterwards.
   testUtils.setTmpLogLevel('warn');
 
   before(async function() {
     // Create a temporary directory, and wipe it out on exit.
-    tmpDir = await tmp.dirAsync({ prefix: 'grist_test_SQLiteDB_', unsafeCleanup: true });
+    ({path: tmpDir, cleanup} = await tmp.dir({ prefix: 'grist_test_SQLiteDB_', unsafeCleanup: true }));
   });
 
-  after(async function() {
-    await fse.remove(tmpDir);
+  after(function() {
+    cleanup();
   });
 
   // Convenience helpers to make tests more concise and readable.