mm
Advanced tools
Comparing version 0.1.7 to 0.1.8
0.1.8 / 2013-12-27 | ||
================== | ||
* fix Node 0.11 broken. (@alsotang) | ||
* fix test cases | ||
0.1.7 / 2013-11-20 | ||
@@ -3,0 +9,0 @@ ================== |
@@ -19,3 +19,3 @@ /*! | ||
var cp = require('child_process'); | ||
var EventEmitter = require('events').EventEmitter; | ||
var semver = require('semver'); | ||
@@ -49,3 +49,3 @@ var mock = module.exports = function mock(obj, key, method) { | ||
* @param {String|Error} error, error string message or error instance. | ||
* @param {Number} [tiemout], mock async callback timeout, default is 0. | ||
* @param {Number} [tiemout], mock async callback timeout, default is 10. | ||
*/ | ||
@@ -80,3 +80,3 @@ exports.error = function (mod, method, error, timeout) { | ||
* @param {Array} datas, return datas array. | ||
* @param {Number} [tiemout], mock async callback timeout, default is 0. | ||
* @param {Number} [tiemout], mock async callback timeout, default is 10. | ||
*/ | ||
@@ -106,3 +106,3 @@ exports.datas = function (mod, method, datas, timeout) { | ||
* @param {Object} data, return data. | ||
* @param {Number} [tiemout], mock async callback timeout, default is 0. | ||
* @param {Number} [tiemout], mock async callback timeout, default is 10. | ||
*/ | ||
@@ -118,3 +118,3 @@ exports.data = function (mod, method, data, timeout) { | ||
* @param {String} method, mock module object method name. | ||
* @param {Number} [tiemout], mock async callback timeout, default is 0. | ||
* @param {Number} [tiemout], mock async callback timeout, default is 10. | ||
*/ | ||
@@ -128,5 +128,9 @@ exports.empty = function (mod, method, timeout) { | ||
http.__sourceRequest = http.request; | ||
https.__sourceRequest = https.request; | ||
getAgent(http).__sourceRequest = getAgent(http).request; | ||
getAgent(https).__sourceRequest = getAgent(https).request; | ||
function getAgent(mod) { | ||
return semver.satisfies(process.version, '>=0.11') ? mod.globalAgent : mod; | ||
} | ||
function matchURL(options, params) { | ||
@@ -175,3 +179,3 @@ var url = params && params.url || params; | ||
* @param {Object} headers, mock response headers. | ||
* @param {Number} [delay], response delay time, default is 0. | ||
* @param {Number} [delay], response delay time, default is 10. | ||
*/ | ||
@@ -189,3 +193,3 @@ exports.http.request = function (url, data, headers, delay) { | ||
* @param {Object} headers, mock response headers. | ||
* @param {Number} [delay], response delay time, default is 0. | ||
* @param {Number} [delay], response delay time, default is 10. | ||
*/ | ||
@@ -202,3 +206,3 @@ exports.https.request = function (url, data, headers, delay) { | ||
delay = delay || 0; | ||
mod.request = function (options, callback) { | ||
getAgent(mod).request = function (options, callback) { | ||
var datas = []; | ||
@@ -215,3 +219,3 @@ if (!Array.isArray(data)) { | ||
if (!match) { | ||
return mod.__sourceRequest(options, callback); | ||
return getAgent(mod).__sourceRequest(options, callback); | ||
} | ||
@@ -269,3 +273,3 @@ | ||
* @param {String|Error} resError, response error. | ||
* @param {Number} [delay], request error delay time, default is 0. | ||
* @param {Number} [delay], request error delay time, default is 10. | ||
*/ | ||
@@ -281,3 +285,3 @@ exports.http.requestError = function (url, reqError, resError, delay) { | ||
* @param {String|Error} resError, response error. | ||
* @param {Number} [delay], request error delay time, default is 0. | ||
* @param {Number} [delay], request error delay time, default is 10. | ||
*/ | ||
@@ -301,6 +305,6 @@ exports.https.requestError = function (url, reqError, resError, delay) { | ||
} | ||
mod.request = function (options, callback) { | ||
getAgent(mod).request = function (options, callback) { | ||
var match = matchURL(options, url); | ||
if (!match) { | ||
return mod.__sourceRequest(options, callback); | ||
return getAgent(mod).__sourceRequest(options, callback); | ||
} | ||
@@ -363,6 +367,6 @@ | ||
exports.restore = function () { | ||
http.request = http.__sourceRequest; | ||
https.request = https.__sourceRequest; | ||
getAgent(http).request = getAgent(http).__sourceRequest; | ||
getAgent(https).request = getAgent(https).__sourceRequest; | ||
muk.restore(); | ||
return this; | ||
}; |
{ | ||
"name": "mm", | ||
"version": "0.1.7", | ||
"version": "0.1.8", | ||
"description": "mock mate, mock http request, fs access and so on.", | ||
@@ -19,5 +19,7 @@ "main": "index.js", | ||
"dependencies": { | ||
"muk": ">=0.3.1" | ||
"muk": ">=0.3.1", | ||
"semver": "~2.2.1" | ||
}, | ||
"devDependencies": { | ||
"contributors": "*", | ||
"should": "*", | ||
@@ -24,0 +26,0 @@ "travis-cov": "*", |
@@ -117,6 +117,6 @@ mm (美眉,Mock伴侣) [![Build Status](https://secure.travis-ci.org/fengmk2/mm.png)](http://travis-ci.org/fengmk2/mm) [![Coverage Status](https://coveralls.io/repos/fengmk2/mm/badge.png)](https://coveralls.io/r/fengmk2/mm) | ||
### Mock `callback(null, data1, data2)` | ||
### Mock `callback(null, [data1, data2])` | ||
```js | ||
mm.datas(urllib, 'request', new Buffer('data'), { headers: { foo: 'bar' } }); | ||
mm.datas(urllib, 'request', [new Buffer('data'), { headers: { foo: 'bar' } }]); | ||
``` | ||
@@ -141,9 +141,11 @@ | ||
project : mm | ||
repo age : 1 year, 1 month | ||
active : 21 days | ||
commits : 49 | ||
files : 15 | ||
repo age : 1 year, 2 months | ||
active : 23 days | ||
commits : 55 | ||
files : 16 | ||
authors : | ||
45 fengmk2 91.8% | ||
4 dead-horse 8.2% | ||
49 fengmk2 89.1% | ||
4 dead-horse 7.3% | ||
1 AlsoTang 1.8% | ||
1 Alsotang 1.8% | ||
``` | ||
@@ -150,0 +152,0 @@ |
18169
8
322
175
2
9
+ Addedsemver@~2.2.1
+ Addedsemver@2.2.1(transitive)