From 70f2b93c35d144ab393eff5acceebfdde458f493 Mon Sep 17 00:00:00 2001 From: Rob Lacy Date: Mon, 3 Sep 2018 15:31:23 -0400 Subject: [PATCH 1/2] W-5364035 update npm dependencies --- package.json | 22 +++++++++++----------- test/unit/auth.js | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 322f94e1..bbf2ee01 100644 --- a/package.json +++ b/package.json @@ -22,22 +22,22 @@ "license": "ISC", "homepage": "https://bitbucket.org/demandware/sfcc-ci#readme", "dependencies": { - "chalk": "^2.3.0", - "commander": "^2.11.0", - "conf": "^1.1.2", - "jsonwebtoken": "^8.1.0", + "chalk": "^2.4.1", + "commander": "^2.17.1", + "conf": "^2.0.0", + "jsonwebtoken": "^8.3.0", "open": "0.0.5", - "request": "^2.82.0", + "request": "^2.88.0", "request-debug": "^0.2.0", - "table": "^4.0.1" + "table": "^4.0.3" }, "devDependencies": { "chai": "^4.1.2", - "eslint": "^4.5.0", + "eslint": "^5.5.0", "istanbul": "^0.4.5", - "mocha": "^3.5.2", - "pkg": "^4.3.0", - "proxyquire": "^2.0.1", - "sinon": "^3.2.1" + "mocha": "^5.2.0", + "pkg": "^4.3.4", + "proxyquire": "^2.1.0", + "sinon": "^6.1.5" } } diff --git a/test/unit/auth.js b/test/unit/auth.js index d4c49989..119c7ef9 100644 --- a/test/unit/auth.js +++ b/test/unit/auth.js @@ -97,7 +97,7 @@ describe('Tests for lib/auth.js', function() { describe('building request to obtain token', function() { beforeEach(function() { - requestStub.post.reset(); + requestStub.post.resetHistory(); }); it('makes a client-credentials request', function() { From f46ebeeb392e6e1fff6ba9fbdea961178cb33c17 Mon Sep 17 00:00:00 2001 From: Rob Lacy Date: Tue, 11 Sep 2018 11:15:56 -0400 Subject: [PATCH 2/2] W-5364035 more updates + switch from open to opn --- lib/auth.js | 4 ++-- lib/job.js | 4 ++-- package.json | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/auth.js b/lib/auth.js index 92242e45..1b6fa9bd 100644 --- a/lib/auth.js +++ b/lib/auth.js @@ -1,7 +1,7 @@ var util = require('util'); var jsonwebtoken = require('jsonwebtoken'); -var open = require('open'); +var opn = require('opn'); var request = require('request'); var config = require('./config').obtain(); @@ -360,7 +360,7 @@ function login(client, clientSecret, authServer) { console.debug('Opening user agent with %s', url); // open the browser - open(url); + opn(url); // create listener for the redirect listen(function(request, response) { diff --git a/lib/job.js b/lib/job.js index f969bae4..4e3d5fb6 100644 --- a/lib/job.js +++ b/lib/job.js @@ -1,7 +1,7 @@ var request = require('request'); var util = require('util'); -var open = require('open'); +var opn = require('opn'); var auth = require('./auth'); var config = require('./config').obtain(); @@ -206,7 +206,7 @@ function status(instance, job_id, job_execution_id, verbose, streamLog, openLogF var logFileUrl = 'https://' + instance + LOG_FILE_DIR + job_execution['log_file_name']; console.info(''); console.info('Opening browser to log file...'); - open(logFileUrl); + opn(logFileUrl); } console.info(''); return; diff --git a/package.json b/package.json index bbf2ee01..930ad8fd 100644 --- a/package.json +++ b/package.json @@ -23,13 +23,13 @@ "homepage": "https://bitbucket.org/demandware/sfcc-ci#readme", "dependencies": { "chalk": "^2.4.1", - "commander": "^2.17.1", + "commander": "^2.18.0", "conf": "^2.0.0", "jsonwebtoken": "^8.3.0", - "open": "0.0.5", + "opn": "^5.3.0", "request": "^2.88.0", "request-debug": "^0.2.0", - "table": "^4.0.3" + "table": "^5.0.2" }, "devDependencies": { "chai": "^4.1.2",