Added tests for CanceledError.rethrow method;

Refactored;
DigitalBrainJS · Dec 13, 2020 · e3d9f6f · e3d9f6f
1 parent 8c9746b
commit e3d9f6f
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 28 deletions.
diff --git a/lib/c-promise.js b/lib/c-promise.js
@@ -19,7 +19,8 @@ const {
     toGenerator,
     toArray,
     buildDecorator,
-    getFnType
+    getFnType,
+    lazyBindMethods
 } = require('./utils');
 
 const {now} = Date;
@@ -1670,6 +1671,11 @@ prototype.removeEventListener = prototype.off;
     }
 });
 
+lazyBindMethods(CPromise, Object.getOwnPropertyNames(CPromise).map(prop => {
+    const {value} = Object.getOwnPropertyDescriptor(CPromise, prop);
+    return typeof value === 'function' ? prop : '';
+}).filter(Boolean));
+
 Object.defineProperties(CPromise, Object.entries({
     CPromise,
     CanceledError,
@@ -1891,31 +1897,6 @@ Object.entries(decorators).forEach(([name, initializer]) => {
     })
 })
 
-const lazyBindMethods = (obj, props) => {
-    props.forEach(prop => {
-        const symbol = Symbol(`${prop}Bound`);
-        const {value: fn} = Object.getOwnPropertyDescriptor(obj, prop);
-
-        Object.defineProperty(obj, prop, {
-            get: function () {
-                return this[symbol] || (this[symbol] = fn.bind(this))
-            },
-
-            set: function (v) {
-                throw Error(`Can not rewrite method ${prop} with ${v}`);
-            },
-
-            enumerable: true,
-            configurable: true
-        })
-    })
-}
-
-lazyBindMethods(CPromise, Object.getOwnPropertyNames(CPromise).map(prop => {
-    const {value} = Object.getOwnPropertyDescriptor(CPromise, prop);
-    return typeof value === 'function' ? prop : '';
-}).filter(Boolean));
-
 exports.CPromise = CPromise;
 /**
  * CanceledError class

diff --git a/lib/canceled-error.js b/lib/canceled-error.js
@@ -13,7 +13,7 @@ const _code = Symbol('code');
 class CanceledError extends Error {
     /**
      * Constructs a new error instance
-     * @param {String} reason
+     * @param {String} [reason]
      */
     constructor(reason = E_REASON_CANCELED) {
         super();

diff --git a/lib/utils.js b/lib/utils.js
@@ -118,6 +118,26 @@ function buildDecorator(builder, name) {
     }
 }
 
+const lazyBindMethods = (obj, props) => {
+    props.forEach(prop => {
+        const symbol = Symbol(`${prop}Bound`);
+        const {value: fn} = Object.getOwnPropertyDescriptor(obj, prop);
+
+        Object.defineProperty(obj, prop, {
+            get: function () {
+                return this[symbol] || (this[symbol] = fn.bind(this))
+            },
+
+            set: function (v) {
+                throw Error(`Can not rewrite method ${prop} with ${v}`);
+            },
+
+            enumerable: true,
+            configurable: true
+        })
+    })
+}
+
 module.exports={
     isThenable,
     setImmediate: _setImmediate,
@@ -127,5 +147,6 @@ module.exports={
     toGenerator,
     toArray,
     getFnType,
-    buildDecorator
+    buildDecorator,
+    lazyBindMethods
 };
diff --git a/test/tests/CanceledError.js b/test/tests/CanceledError.js
@@ -0,0 +1,32 @@
+const assert = require('assert');
+const {CPromise, E_REASON_TIMEOUT, E_REASON_DISPOSED} = require('../../lib/c-promise');
+const {CanceledError} = CPromise;
+
+module.exports = {
+    'CanceledError.throw': {
+        'should throw the error that is instance of CanceledError': function () {
+            const originalErr = new CanceledError();
+            try {
+                CanceledError.rethrow(originalErr);
+            } catch (err) {
+                assert.strictEqual(err, originalErr);
+            }
+        },
+
+        'should throw the error only if some error code matched': function () {
+            const originalErr = new CanceledError(E_REASON_TIMEOUT);
+            try {
+                CanceledError.rethrow(originalErr, E_REASON_DISPOSED);
+            } catch (err) {
+                assert.fail('should not throw');
+            }
+
+            try {
+                CanceledError.rethrow(originalErr, E_REASON_TIMEOUT);
+            } catch (err) {
+                assert.strictEqual(err, originalErr);
+            }
+        }
+    }
+}
+