Skip to content

Commit

Permalink
Update to latest dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
silas committed Jun 10, 2018
1 parent a75189f commit e197768
Show file tree
Hide file tree
Showing 6 changed files with 59 additions and 61 deletions.
6 changes: 2 additions & 4 deletions .travis.yml
@@ -1,8 +1,6 @@
sudo: false
language: node_js
node_js:
- "10"
- "8"
- "6"
- "5"
- "4"
- "0.12"
- "0.10"
4 changes: 2 additions & 2 deletions lib/job.js
Expand Up @@ -117,7 +117,7 @@ Job.prototype.config = function(opts, callback) {
if (opts.xml) {
req.method = 'POST';
req.headers = { 'content-type': 'text/xml; charset=utf-8' };
req.body = new Buffer(opts.xml);
req.body = Buffer.from(opts.xml);
} else {
req.method = 'GET';
}
Expand Down Expand Up @@ -221,7 +221,7 @@ Job.prototype.create = function(opts, callback) {
req.headers = { 'content-type': 'text/xml; charset=utf-8' };
req.params = { dir: folder.dir() };
req.query.name = folder.name();
req.body = new Buffer(opts.xml);
req.body = Buffer.from(opts.xml);
} catch (err) {
return callback(this.jenkins._err(err, req));
}
Expand Down
2 changes: 1 addition & 1 deletion lib/node.js
Expand Up @@ -67,7 +67,7 @@ Node.prototype.config = function(opts, callback) {

req.method = 'POST';
req.headers = { 'content-type': 'text/xml; charset=utf-8' };
req.body = new Buffer(opts.xml);
req.body = Buffer.from(opts.xml);
} else {
req.method = 'GET';
}
Expand Down
2 changes: 1 addition & 1 deletion lib/view.js
Expand Up @@ -130,7 +130,7 @@ View.prototype.config = function(opts, callback) {
if (opts.xml) {
req.method = 'POST';
req.headers = { 'content-type': 'text/xml; charset=utf-8' };
req.body = new Buffer(opts.xml);
req.body = Buffer.from(opts.xml);
} else {
req.method = 'GET';
}
Expand Down
28 changes: 14 additions & 14 deletions package.json
@@ -1,24 +1,24 @@
{
"name": "jenkins",
"description": "Jenkins client",
"version": "0.20.1",
"version": "0.21.0",
"main": "./lib",
"dependencies": {
"papi": "^0.26.0"
"papi": "^0.28.0"
},
"devDependencies": {
"async": "^0.9.0",
"bluebird": "^3.1.1",
"fixturefiles": "^0.1.0",
"istanbul": "^0.3.6",
"jscs": "^1.5.8",
"jshint": "^2.5.2",
"lodash": "^3.3.1",
"mocha": "^2.0.1",
"nock": "^1.4.0",
"node-uuid": "^1.4.1",
"should": "^10.0.0",
"sinon": "^1.17.2"
"async": "^2.6.1",
"bluebird": "^3.5.1",
"fixturefiles": "^0.3.0",
"istanbul": "^0.4.5",
"jscs": "^3.0.7",
"jshint": "^2.9.5",
"lodash": "^4.17.10",
"mocha": "^5.2.0",
"nock": "^9.3.2",
"node-uuid": "^1.4.8",
"should": "^13.2.1",
"sinon": "^5.1.1"
},
"keywords": [
"jenkins"
Expand Down
78 changes: 39 additions & 39 deletions test/jenkins.js
Expand Up @@ -31,7 +31,7 @@ var nit = helper.nit;
describe('jenkins', function() {

beforeEach(function() {
this.sinon = sinon.sandbox.create();
this.sinon = sinon.createSandbox();

this.url = helper.config.url;
this.nock = nock(this.url);
Expand Down Expand Up @@ -314,7 +314,7 @@ describe('jenkins', function() {
self.jenkins.job.config(self.jobName, next);
};

jobs.update = ['before', function(next, results) {
jobs.update = ['before', function(results, next) {
var config = results.before.replace(
'<description>before</description>',
'<description>after</description>'
Expand All @@ -323,7 +323,7 @@ describe('jenkins', function() {
self.jenkins.job.config(self.jobName, config, next);
}];

jobs.after = ['update', function(next) {
jobs.after = ['update', function(results, next) {
self.jenkins.job.config(self.jobName, next);
}];

Expand Down Expand Up @@ -358,11 +358,11 @@ describe('jenkins', function() {
self.jenkins.job.exists(name, next);
};

jobs.copy = ['before', function(next) {
jobs.copy = ['before', function(results, next) {
self.jenkins.job.copy(self.jobName, name, next);
}];

jobs.after = ['copy', function(next) {
jobs.after = ['copy', function(results, next) {
self.jenkins.job.exists(name, next);
}];

Expand Down Expand Up @@ -397,11 +397,11 @@ describe('jenkins', function() {
self.jenkins.job.exists(name, next);
};

jobs.create = ['before', function(next) {
jobs.create = ['before', function(results, next) {
self.jenkins.job.create(name, fixtures.jobCreate, next);
}];

jobs.after = ['create', function(next) {
jobs.after = ['create', function(results, next) {
self.jenkins.job.exists(name, next);
}];

Expand Down Expand Up @@ -451,11 +451,11 @@ describe('jenkins', function() {
self.jenkins.job.exists(self.jobName, next);
};

jobs.create = ['before', function(next) {
jobs.create = ['before', function(results, next) {
self.jenkins.job.destroy(self.jobName, next);
}];

jobs.after = ['create', function(next) {
jobs.after = ['create', function(results, next) {
self.jenkins.job.exists(self.jobName, next);
}];

Expand Down Expand Up @@ -502,11 +502,11 @@ describe('jenkins', function() {
self.jenkins.job.get(self.jobName, next);
};

jobs.create = ['before', function(next) {
jobs.create = ['before', function(results, next) {
self.jenkins.job.disable(self.jobName, next);
}];

jobs.after = ['create', function(next) {
jobs.after = ['create', function(results, next) {
self.jenkins.job.get(self.jobName, next);
}];

Expand Down Expand Up @@ -541,15 +541,15 @@ describe('jenkins', function() {
self.jenkins.job.disable(self.jobName, next);
};

jobs.before = ['setup', function(next) {
jobs.before = ['setup', function(results, next) {
self.jenkins.job.get(self.jobName, next);
}];

jobs.enable = ['before', function(next) {
jobs.enable = ['before', function(results, next) {
self.jenkins.job.enable(self.jobName, next);
}];

jobs.after = ['enable', function(next) {
jobs.after = ['enable', function(results, next) {
self.jenkins.job.get(self.jobName, next);
}];

Expand Down Expand Up @@ -753,11 +753,11 @@ describe('jenkins', function() {
});
};

jobs.destroy = ['before', function(next) {
jobs.destroy = ['before', function(results, next) {
self.jenkins.node.destroy(self.nodeName, next);
}];

jobs.after = ['destroy', function(next) {
jobs.after = ['destroy', function(results, next) {
self.jenkins.node.exists(self.nodeName, function(err, exists) {
should.not.exist(err);

Expand Down Expand Up @@ -808,23 +808,23 @@ describe('jenkins', function() {
});
};

jobs.disable = ['beforeDisable', function(next) {
jobs.disable = ['beforeDisable', function(results, next) {
self.jenkins.node.disable(self.nodeName, 'away', next);
}];

jobs.afterDisable = ['disable', function(next) {
jobs.afterDisable = ['disable', function(results, next) {
self.jenkins.node.get(self.nodeName, function(err, node) {
should.not.exist(err);

next(null, node);
});
}];

jobs.update = ['afterDisable', function(next) {
jobs.update = ['afterDisable', function(results, next) {
self.jenkins.node.disable(self.nodeName, 'update', next);
}];

jobs.afterUpdate = ['update', function(next) {
jobs.afterUpdate = ['update', function(results, next) {
self.jenkins.node.get(self.nodeName, function(err, node) {
should.not.exist(err);

Expand Down Expand Up @@ -870,19 +870,19 @@ describe('jenkins', function() {
self.jenkins.node.disable(self.nodeName, 'away', next);
};

jobs.before = ['disable', function(next) {
jobs.before = ['disable', function(results, next) {
self.jenkins.node.get(self.nodeName, function(err, node) {
should.not.exist(err);

next(null, node);
});
}];

jobs.enable = ['before', function(next) {
jobs.enable = ['before', function(results, next) {
self.jenkins.node.enable(self.nodeName, next);
}];

jobs.after = ['enable', function(next) {
jobs.after = ['enable', function(results, next) {
self.jenkins.node.get(self.nodeName, function(err, node) {
should.not.exist(err);

Expand Down Expand Up @@ -937,23 +937,23 @@ describe('jenkins', function() {
);
};

jobs.disconnect = ['beforeDisconnect', function(next) {
jobs.disconnect = ['beforeDisconnect', function(results, next) {
self.jenkins.node.disconnect(self.nodeName, 'away', next);
}];

jobs.afterDisconnect = ['disconnect', function(next) {
jobs.afterDisconnect = ['disconnect', function(results, next) {
self.jenkins.node.get(self.nodeName, function(err, node) {
should.not.exist(err);

next(null, node);
});
}];

jobs.update = ['afterDisconnect', function(next) {
jobs.update = ['afterDisconnect', function(results, next) {
self.jenkins.node.disconnect(self.nodeName, 'update', next);
}];

jobs.afterUpdate = ['update', function(next) {
jobs.afterUpdate = ['update', function(results, next) {
self.jenkins.node.get(self.nodeName, function(err, node) {
should.not.exist(err);

Expand Down Expand Up @@ -1256,11 +1256,11 @@ describe('jenkins', function() {
self.jenkins.view.exists(name, next);
};

jobs.create = ['before', function(next) {
jobs.create = ['before', function(results, next) {
self.jenkins.view.create(name, 'list', next);
}];

jobs.after = ['create', function(next) {
jobs.after = ['create', function(results, next) {
self.jenkins.view.exists(name, next);
}];

Expand Down Expand Up @@ -1328,13 +1328,13 @@ describe('jenkins', function() {
self.jenkins.view.config(self.viewName, next);
};

jobs.config = ['before', function(next) {
jobs.config = ['before', function(results, next) {
var config = fixtures.viewConfig.replace(src, dst);

self.jenkins.view.config(self.viewName, config, next);
}];

jobs.after = ['config', function(next) {
jobs.after = ['config', function(results, next) {
self.jenkins.view.config(self.viewName, next);
}];

Expand Down Expand Up @@ -1367,11 +1367,11 @@ describe('jenkins', function() {
self.jenkins.view.exists(self.viewName, next);
};

jobs.create = ['before', function(next) {
jobs.create = ['before', function(results, next) {
self.jenkins.view.destroy(self.viewName, next);
}];

jobs.after = ['create', function(next) {
jobs.after = ['create', function(results, next) {
self.jenkins.view.exists(self.viewName, next);
}];

Expand Down Expand Up @@ -1522,11 +1522,11 @@ describe('jenkins', function() {
self.jenkins.view.get(self.viewName, next);
};

jobs.add = ['before', function(next) {
jobs.add = ['before', function(results, next) {
self.jenkins.view.add(self.viewName, self.jobName, next);
}];

jobs.after = ['add', function(next) {
jobs.after = ['add', function(results, next) {
self.jenkins.view.get(self.viewName, next);
}];

Expand Down Expand Up @@ -1564,15 +1564,15 @@ describe('jenkins', function() {
self.jenkins.view.add(self.viewName, self.jobName, next);
};

jobs.before = ['add', function(next) {
jobs.before = ['add', function(results, next) {
self.jenkins.view.get(self.viewName, next);
}];

jobs.remove = ['before', function(next) {
jobs.remove = ['before', function(results, next) {
self.jenkins.view.remove(self.viewName, self.jobName, next);
}];

jobs.after = ['remove', function(next) {
jobs.after = ['remove', function(results, next) {
self.jenkins.view.get(self.viewName, next);
}];

Expand Down Expand Up @@ -1676,7 +1676,7 @@ describe('jenkins', function() {
it('should prefix error message', function() {
var self = this;

self.sinon.stub(papi.tools, 'promisify', function() {
self.sinon.stub(papi.tools, 'promisify').callsFake(function() {
throw new Error('test');
});

Expand Down

0 comments on commit e197768

Please sign in to comment.