Merge pull request #3 from vadzim/master

do not throw on non-thenables
xobotyi · Aug 6, 2018 · b5fd791 · b5fd791
2 parents 6f9cb8b + 7e0f159
commit b5fd791
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/await-of.js b/src/await-of.js
@@ -5,7 +5,7 @@
  * @return {Promise<Array>} Array with `[results, error]`
  */
 export default function of(promise) {
-    return promise
+    return Promise.resolve(promise)
             .then((ret) => [ret])
             .catch((err) => {
                 if (err === undefined || err === null) {

diff --git a/tests/await-of.spec.js b/tests/await-of.spec.js
@@ -38,4 +38,20 @@ describe("await-of test",
                  expect(err.originalValue).toBeUndefined();
                  expect(err.message).toEqual('Rejection with empty value');
              });
+
+             it("should not throw on non-thenables", async () => {
+                 const result = "Hello world!";
+                 const [data, err] = await of(result);
+
+                 expect(err).toBeUndefined();
+                 expect(data).toEqual(result);
+             });
+
+             it("should not throw on nulls", async () => {
+                 const result = null;
+                 const [data, err] = await of(result);
+
+                 expect(err).toBeUndefined();
+                 expect(data).toEqual(result);
+             });
          });