Merge e43ba47 into 60d2f15

node-modules · Aug 22, 2015 · f0535e5 · f0535e5
2 parents 60d2f15 + e43ba47
commit f0535e5
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 25 deletions.
diff --git a/lib/es6.js b/lib/es6.js
@@ -46,19 +46,13 @@ mm.data = function (mod, method, data, timeout) {
 };
 
 var mockError = mm.error;
-mm.error = function (mod, method, error, timeout) {
+mm.error = function (mod, method, error, props, timeout) {
   if (!is.generatorFunction(mod[method])) {
-    return mockError.call(mm, mod, method, error, timeout);
+    return mockError.call(mm, mod, method, error, props, timeout);
   }
 
-  if (!error) {
-    error = new Error('mm mock error');
-    error.name = 'MockError';
-  }
-  if (typeof error === 'string') {
-    error = new Error(error);
-    error.name = 'MockError';
-  }
+  mm._createError(error, props);
+
   if (timeout) {
     timeout = parseInt(timeout, 10);
   }

diff --git a/lib/mm.js b/lib/mm.js
@@ -51,13 +51,13 @@ function getCallback(args) {
 }
 
 /**
- * Mock async function error.
- * @param {Object} mod, module object
- * @param {String} method, mock module object method name.
- * @param {String|Error} error, error string message or error instance.
- * @param {Number} [tiemout], mock async callback timeout, default is 10.
+ * create an error instance
+ *
+ * @param  {String|Error} error
+ * @param  {Object} props
+ * @return {Error}
  */
-exports.error = function (mod, method, error, timeout) {
+exports._createError = function (error, props) {
   if (!error) {
     error = new Error('mm mock error');
     error.name = 'MockError';
@@ -66,6 +66,29 @@ exports.error = function (mod, method, error, timeout) {
     error = new Error(error);
     error.name = 'MockError';
   }
+  props = props || {};
+  for (var key in props) {
+    error[key] = props[key];
+  }
+
+  return error;
+};
+
+/**
+ * Mock async function error.
+ * @param {Object} mod, module object
+ * @param {String} method, mock module object method name.
+ * @param {String|Error} error, error string message or error instance.
+ * @param {Object} [props], error properties
+ * @param {Number} [tiemout], mock async callback timeout, default is 10.
+ */
+exports.error = function (mod, method, error, props, timeout) {
+  if (typeof props === 'number') {
+    timeout = props;
+    props = {};
+  }
+  error = exports._createError(error, props);
+
   if (timeout) {
     timeout = parseInt(timeout, 10);
   }
@@ -133,16 +156,10 @@ exports.empty = function (mod, method, timeout) {
  * @param {Object} mod, module object
  * @param {String} method, mock module object method name.
  * @param {String|Error} error, error string message or error instance.
+ * @param {Object} [props], error properties
  */
-exports.syncError = function (mod, method, error) {
-  if (!error) {
-    error = new Error('mm mock error');
-    error.name = 'MockError';
-  }
-  if (typeof error === 'string') {
-    error = new Error(error);
-    error.name = 'MockError';
-  }
+exports.syncError = function (mod, method, error, props) {
+  error = exports._createError(error, props);
   mock(mod, method, function () {
     throw error;
   });

diff --git a/test/es6.js b/test/es6.js
@@ -73,6 +73,27 @@ describe('test/es6.test.js', function () {
       } catch (err) {
         err.message.should.equal('new foo error');
       }
+
+      mm.error(foo, 'getValue', new Error('new foo error'), {status: 500});
+      try {
+        yield* foo.getValue();
+        throw new Error('should not run this');
+      } catch (err) {
+        err.message.should.equal('new foo error');
+        err.status.should.equal(500);
+      }
+
+      mm.error(foo, 'getValue', new Error('new foo error'), {status: 500}, 100);
+      try {
+        var start = Date.now();
+        yield* foo.getValue();
+        throw new Error('should not run this');
+      } catch (err) {
+        var use = Date.now() - start;
+        err.message.should.equal('new foo error');
+        err.status.should.equal(500);
+        use.should.above(90);
+      }
     });
   });
 });
diff --git a/test/mm.test.js b/test/mm.test.js
@@ -191,6 +191,18 @@ describe('mm.test.js', function () {
       });
     });
 
+    it('should mock error with properties', function (done) {
+      mm.error(fs, 'readFile', 'mm mock error', { code: 'ENOENT', name: 'MockError' });
+      fs.readFile('/etc/hosts', 'utf8', function (err, data) {
+        should.exist(err);
+        err.name.should.equal('MockError');
+        err.message.should.equal('mm mock error');
+        err.code.should.equal('ENOENT');
+        should.not.exist(data);
+        done();
+      });
+    });
+
     it('should mock error with 500ms timeout', function (done) {
       mm.error(fs, 'readFile', '500ms timeout', 500);
       var start = Date.now();
@@ -205,6 +217,21 @@ describe('mm.test.js', function () {
       });
     });
 
+    it('should mock error with 500ms timeout and properties', function (done) {
+      mm.error(fs, 'readFile', '500ms timeout', { code: 'ENOENT' }, 500);
+      var start = Date.now();
+      fs.readFile('/etc/hosts', 'utf8', function (err, data) {
+        var use = Date.now() - start;
+        should.exist(err);
+        err.name.should.equal('MockError');
+        err.message.should.equal('500ms timeout');
+        err.code.should.equal('ENOENT');
+        should.not.exist(data);
+        use.should.above(490);
+        done();
+      });
+    });
+
     it.skip('should work for callback is not the last params case', function (done) {
       var foo = require('./foo');
       done = pedding(3, done);