test(deps): upgrade vows and sandboxed-module to support node v7

add a missing dependency - axios.
adjust tests to be compatible with latest sandboxed-module.
This commit is contained in:
e-cloud 2016-12-12 21:07:27 +08:00
parent 7d9dc55ff2
commit ff182149f3
9 changed files with 24 additions and 6 deletions

View File

@ -1,6 +1,7 @@
language: node_js
sudo: false
node_js:
- "7"
- "6"
- "5"
- "4"

View File

@ -42,10 +42,10 @@
"eslint-config-airbnb-base": "^11.0.0",
"eslint-plugin-import": "^2.0.0",
"ghooks": "^1.2.1",
"sandboxed-module": "0.3.0",
"sandboxed-module": "^2.0.3",
"tape": "^4.6.2",
"validate-commit-msg": "^2.6.1",
"vows": "0.7.0"
"vows": "0.8.0"
},
"optionalDependencies": {
"hipchat-notifier": "^1.1.0",
@ -83,5 +83,8 @@
},
"commit-msg": "validate-commit-msg"
}
},
"peerDependencies": {
"axios": "^0.15.3"
}
}

View File

@ -115,6 +115,7 @@ vows.describe('log4js cluster appender').addBatch({
send: function(data) {
registeredProcessEvents.push(data);
},
env: process.env
};

View File

@ -26,6 +26,7 @@ vows.describe('log4js configure').addBatch({
log4js = sandbox.require(
'../../lib/log4js',
{
singleOnly: true,
requires: {
'./appenders/cheese': testAppender
}
@ -56,9 +57,12 @@ vows.describe('log4js configure').addBatch({
var testAppender = makeTestAppender(),
log4js = sandbox.require(
'../../lib/log4js',
{ requires: { './appenders/cheese': testAppender } }
{
singleOnly: true,
requires: { './appenders/cheese': testAppender }
}
);
log4js.loadAppender('cheese');
return log4js;
},
@ -74,7 +78,10 @@ vows.describe('log4js configure').addBatch({
var testAppender = makeTestAppender(),
log4js = sandbox.require(
'../../lib/log4js',
{ requires: { 'some/other/external': testAppender } }
{
singleOnly: true,
requires: { 'some/other/external': testAppender }
}
);
log4js.loadAppender('some/other/external');
return log4js;

View File

@ -57,6 +57,7 @@ vows.describe('log4js fileAppender').addBatch({
}
}
},
singleOnly: true,
requires: {
'streamroller': {
RollingFileStream: function(filename) {

View File

@ -57,6 +57,7 @@ var vows = require('vows')
messagePassThroughLayout: realLayouts.messagePassThroughLayout
}
, appender = sandbox.require('../../lib/appenders/gelf', {
singleOnly: true,
requires: {
dgram: fakeDgram,
zlib: fakeZlib,

View File

@ -10,7 +10,9 @@ vows.describe('log4js-abspath').addBatch({
var appenderOptions,
log4js = sandbox.require(
'../../lib/log4js',
{ requires:
{
singleOnly: true,
requires:
{ './appenders/fake':
{ name: "fake",
appender: function() {},

View File

@ -25,6 +25,7 @@ function setupLogging(category, options) {
};
var logstashModule = sandbox.require('../../lib/appenders/logstashUDP', {
singleOnly: true,
requires: {
'dgram': fakeDgram
}

View File

@ -42,6 +42,7 @@ function setupLogging(category, options) {
};
var smtpModule = sandbox.require('../../lib/appenders/smtp', {
singleOnly: true,
requires: {
'nodemailer': fakeMailer,
'nodemailer-sendmail-transport': fakeTransportPlugin,