Comparing version 0.6.1 to 0.6.2
@@ -120,3 +120,3 @@ /** | ||
config.server.port = config.server.port || (config.https ? 443 : 80); | ||
config.path = urlparsed.path; | ||
path = urlparsed.path; | ||
} | ||
@@ -123,0 +123,0 @@ } |
@@ -93,3 +93,3 @@ /** | ||
if (subfix === prefer) { | ||
if (subfix === '.' + prefer) { | ||
// load orgin file if subfix == prefer | ||
@@ -96,0 +96,0 @@ filePath = subPath; |
{ | ||
"name": "node-ral", | ||
"version": "0.6.1", | ||
"description": "a rpc client for node", | ||
"main": "index.js", | ||
"scripts": { | ||
"pub": "npm publish --registry=http://registry.npmjs.org", | ||
"test": "mocha -t 200000 --check-leaks test/", | ||
"test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot -t 200000 --check-leaks test/", | ||
"test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter spec --check-leaks -t 200000 --slow 0 test/" | ||
}, | ||
"repository": { | ||
"type": "git", | ||
"url": "https://github.com/fex-team/node-ral.git" | ||
}, | ||
"keywords": [ | ||
"rpc", | ||
"ral", | ||
"fis" | ||
], | ||
"author": "FIS", | ||
"license": "BSD", | ||
"bugs": { | ||
"url": "https://github.com/fex-team/node-ral/issues" | ||
}, | ||
"homepage": "https://github.com/fex-team/node-ral", | ||
"dependencies": { | ||
"chai": "1.9.1", | ||
"form-data": "0.1.4", | ||
"iconv-lite": "0.4.13", | ||
"performance-now": "0.2.0", | ||
"soap": "0.8.0", | ||
"underscore": "1.6.0", | ||
"urlencode": "1.1.0", | ||
"yog-log": "0.0.22" | ||
}, | ||
"devDependencies": { | ||
"request": "2.40.0", | ||
"async": "0.9.0", | ||
"combined-stream": "0.0.5", | ||
"formidable": "1.0.17", | ||
"istanbul": "0.3.0", | ||
"mocha": "2.3.3", | ||
"should": "4.0.4" | ||
} | ||
"name": "node-ral", | ||
"version": "0.6.2", | ||
"description": "a rpc client for node", | ||
"main": "index.js", | ||
"scripts": { | ||
"pub": "npm publish --registry=http://registry.npmjs.org", | ||
"test": "mocha -t 200000 --check-leaks test/", | ||
"test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot -t 200000 --check-leaks test/", | ||
"test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter spec --check-leaks -t 200000 --slow 0 test/" | ||
}, | ||
"repository": { | ||
"type": "git", | ||
"url": "https://github.com/fex-team/node-ral.git" | ||
}, | ||
"keywords": [ | ||
"rpc", | ||
"ral", | ||
"fis" | ||
], | ||
"author": "FIS", | ||
"license": "BSD", | ||
"bugs": { | ||
"url": "https://github.com/fex-team/node-ral/issues" | ||
}, | ||
"homepage": "https://github.com/fex-team/node-ral", | ||
"dependencies": { | ||
"chai": "1.9.1", | ||
"form-data": "0.1.4", | ||
"iconv-lite": "0.4.13", | ||
"performance-now": "0.2.0", | ||
"soap": "0.8.0", | ||
"underscore": "1.6.0", | ||
"urlencode": "1.1.0", | ||
"yog-log": "0.0.22" | ||
}, | ||
"devDependencies": { | ||
"request": "2.40.0", | ||
"async": "0.9.0", | ||
"combined-stream": "0.0.5", | ||
"formidable": "1.0.17", | ||
"istanbul": "0.3.0", | ||
"mocha": "2.3.3", | ||
"should": "4.0.4" | ||
} | ||
} |
@@ -127,3 +127,3 @@ /** | ||
ctx.env = origin; | ||
config.getRawConf().should.have.keys('a', 'b', 'c', 'd', 'e', 'g'); | ||
config.getRawConf().should.have.keys('a', 'b', 'c', 'd', 'e', 'g', 'h'); | ||
config.getConf('a').query.name.should.equal('normal'); | ||
@@ -135,2 +135,3 @@ config.getConf('b').query.name.should.equal('normal'); | ||
config.getConf('g').query.name.should.equal('default'); | ||
config.getConf('h').query.name.should.equal('normal'); | ||
}); | ||
@@ -144,3 +145,3 @@ | ||
ctx.env = origin; | ||
config.getRawConf().should.have.keys('a', 'b', 'c', 'd', 'e', 'g'); | ||
config.getRawConf().should.have.keys('a', 'b', 'c', 'd', 'e', 'g', 'h'); | ||
config.getConf('a').query.name.should.equal('normal'); | ||
@@ -152,2 +153,3 @@ config.getConf('b').query.name.should.equal('normal'); | ||
config.getConf('g').query.name.should.equal('default'); | ||
config.getConf('h').query.name.should.equal('prod'); | ||
}); | ||
@@ -161,3 +163,3 @@ | ||
ctx.env = origin; | ||
config.getRawConf().should.have.keys('a', 'b', 'c', 'd', 'e', 'g'); | ||
config.getRawConf().should.have.keys('a', 'b', 'c', 'd', 'e', 'g', 'h'); | ||
config.getConf('a').query.name.should.equal('kk'); | ||
@@ -169,2 +171,3 @@ config.getConf('b').query.name.should.equal('normal'); | ||
config.getConf('g').query.name.should.equal('default'); | ||
config.getConf('h').query.name.should.equal('normal'); | ||
}); | ||
@@ -179,3 +182,3 @@ | ||
ctx.env = origin; | ||
config.getRawConf().should.have.keys('a', 'b', 'c', 'd', 'e', 'f', 'g'); | ||
config.getRawConf().should.have.keys('a', 'b', 'c', 'd', 'e', 'f', 'g', 'h'); | ||
config.getConf('a').query.name.should.equal('dev'); | ||
@@ -188,3 +191,5 @@ config.getConf('b').query.name.should.equal('normal'); | ||
config.getConf('g').query.name.should.equal('dev'); | ||
config.getConf('h').query.name.should.equal('dev'); | ||
}); | ||
}); |
@@ -695,3 +695,4 @@ /** | ||
}).on('error', function (err) { | ||
should.not.exist(err); | ||
err.should.not.be.ok; | ||
console.error(err); | ||
done(); | ||
@@ -714,3 +715,4 @@ }); | ||
}).on('error', function (err) { | ||
should.not.exist(err); | ||
err.should.not.be.ok; | ||
console.error(err); | ||
done(); | ||
@@ -717,0 +719,0 @@ }); |
328046
90
9600