Replace pFinally with native code

keystonejs · Jul 23, 2020 · 01eab32 · 01eab32
1 parent de0c144
commit 01eab32
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/.changeset/wet-buttons-collect.md b/.changeset/wet-buttons-collect.md
@@ -0,0 +1,5 @@
+---
+'@keystonejs/test-utils': patch
+---
+
+Replaced use of "p-finally" library with native Node code.
diff --git a/packages/test-utils/lib/test-utils.js b/packages/test-utils/lib/test-utils.js
@@ -1,7 +1,6 @@
 const express = require('express');
 const supertest = require('supertest-light');
 const MongoDBMemoryServer = require('mongodb-memory-server-core').default;
-const pFinally = require('p-finally');
 const url = require('url');
 const { Keystone } = require('@keystonejs/keystone');
 const { GraphQLApp } = require('@keystonejs/app-graphql');
@@ -185,17 +184,19 @@ function _keystoneRunner(adapterName, tearDownFunction) {
 
       await keystone.connect();
 
-      return pFinally(
-        testFn({
+      try {
+        await testFn({
           ...setup,
           create: getCreate(keystone),
           findById: getFindById(keystone),
           findOne: getFindOne(keystone),
           update: getUpdate(keystone),
           delete: getDelete(keystone),
-        }),
-        () => keystone.disconnect().then(tearDownFunction)
-      );
+        });
+      } finally {
+        await keystone.disconnect();
+        await tearDownFunction();
+      }
     };
   };
 }

diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
@@ -14,7 +14,6 @@
     "@keystonejs/keystone": "^12.0.0",
     "express": "^4.17.1",
     "mongodb-memory-server-core": "^6.5.2",
-    "p-finally": "^2.0.1",
     "supertest-light": "^1.0.3"
   },
   "repository": "https://github.com/keystonejs/keystone/tree/master/packages/test-utils"

diff --git a/yarn.lock b/yarn.lock
@@ -17894,7 +17894,7 @@ p-finally@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
   integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
-p-finally@^2.0.0, p-finally@^2.0.1:
+p-finally@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561"
   integrity sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==