patch: use isPromise utility (#501)

ealush · Nov 15, 2020 · 56b195d · 56b195d
1 parent 670887d
commit 56b195d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/jsconfig.json b/jsconfig.json
@@ -11,6 +11,9 @@
       "isFunction": [
         "./packages/__shared/src/isFunction.js"
       ],
+      "isPromise": [
+        "./packages/__shared/src/isPromise.js"
+      ],
       "isStringValue": [
         "./packages/__shared/src/isStringValue.js"
       ],

diff --git a/packages/__shared/src/isPromise.js b/packages/__shared/src/isPromise.js
@@ -0,0 +1,5 @@
+import isFunction from 'isFunction';
+
+export default function isPromise(value) {
+  return value && isFunction(value.then);
+}
diff --git a/packages/vest/src/core/test/test.js b/packages/vest/src/core/test/test.js
@@ -3,6 +3,7 @@ import addTestToState from 'addTestToState';
 import context from 'ctx';
 import { isExcluded } from 'exclusive';
 import isFunction from 'isFunction';
+import isPromise from 'isPromise';
 import { setPending } from 'pending';
 import runAsyncTest from 'runAsyncTest';
 import bindTestMemo from 'test.memo';
@@ -43,7 +44,7 @@ const register = testObject => {
   try {
     // try catch for safe property access
     // in case object is an enforce chain
-    if (isFunction(result?.then)) {
+    if (isPromise(result)) {
       testObject.asyncTest = result;
       setPending(testObject);
       runAsyncTest(testObject);

diff --git a/packages/vest/src/core/test/test.memo.js b/packages/vest/src/core/test/test.memo.js
@@ -1,8 +1,8 @@
 import addTestToState from 'addTestToState';
 import createCache from 'cache';
 import { isExcluded } from 'exclusive';
-import isFunction from 'isFunction';
 import { isNull } from 'isNull';
+import isPromise from 'isPromise';
 import { setPending } from 'pending';
 import runAsyncTest from 'runAsyncTest';
 import useSuiteId from 'useSuiteId';
@@ -42,7 +42,7 @@ export default function bindTestMemo(test) {
 
     addTestToState(testObject);
 
-    if (isFunction(testObject?.asyncTest?.then)) {
+    if (isPromise(testObject?.asyncTest)) {
       setPending(testObject);
       runAsyncTest(testObject);
     }