diff --git a/package-lock.json b/package-lock.json index 323b0b898..ea8d08a51 100644 --- a/package-lock.json +++ b/package-lock.json @@ -516,11 +516,11 @@ "dev": true }, "@twilio/cli-core": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@twilio/cli-core/-/cli-core-4.0.1.tgz", - "integrity": "sha512-w8NtnDNCHmNwOXGaHShYE2HZyNIgPM2jU7BYik+UUT0Vf9d/usSXfFoqwlsxYnuDrhRzIxp9WTVU+j5X43U+WQ==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@twilio/cli-core/-/cli-core-4.0.2.tgz", + "integrity": "sha512-KCp6hK0AX8Zz7gU33o2oncPajuPIHQG/VowGjsKz5HhUDX6W8YmbKwyWFRwZIDaCpNlkjNT5jxx59b1vaFpQkw==", "requires": { - "@oclif/command": "^1.5.18", + "@oclif/command": "^1.5.19", "@oclif/config": "^1.13.3", "@oclif/errors": "^1.2.2", "@oclif/plugin-help": "^2.2.1", @@ -533,24 +533,53 @@ "shelljs": "^0.8.3", "tsv": "^0.2.0", "twilio": "^3.34.0" + }, + "dependencies": { + "@oclif/command": { + "version": "1.5.19", + "resolved": "https://registry.npmjs.org/@oclif/command/-/command-1.5.19.tgz", + "integrity": "sha512-6+iaCMh/JXJaB2QWikqvGE9//wLEVYYwZd5sud8aLoLKog1Q75naZh2vlGVtg5Mq/NqpqGQvdIjJb3Bm+64AUQ==", + "requires": { + "@oclif/config": "^1", + "@oclif/errors": "^1.2.2", + "@oclif/parser": "^3.8.3", + "@oclif/plugin-help": "^2", + "debug": "^4.1.1", + "semver": "^5.6.0" + } + } } }, "@twilio/cli-test": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@twilio/cli-test/-/cli-test-2.0.0.tgz", - "integrity": "sha512-bkNS1q/nqL231Lf1fatw7Vr6MOqxoQ7oc2GRyu9YCux6Q4btyFKwDvruTSu/STM5Y+ykQ3WpIW7tnwCaksfqvw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@twilio/cli-test/-/cli-test-2.0.1.tgz", + "integrity": "sha512-h42FUKm02nBJPYQVaeGbXyAJJQ/FSFNycGCxtTvwtzXDDsQe0RH2RI5L7prcfwmUkbKmWA4Ylls4PtKmZ7EQXQ==", "dev": true, "requires": { - "@oclif/command": "^1.5.18", - "@oclif/config": "^1.13.2", - "@oclif/test": "^1.1.0", - "chai": "^4.1.2", + "@oclif/command": "^1.5.19", + "@oclif/config": "^1.13.3", + "@oclif/test": "^1.2.5", + "chai": "^4.2.0", "chai-as-promised": "^7.1.1", "nock": "^10.0.6", - "sinon": "^6.3.4", + "sinon": "^6.3.5", "tmp": "0.0.33" }, "dependencies": { + "@oclif/command": { + "version": "1.5.19", + "resolved": "https://registry.npmjs.org/@oclif/command/-/command-1.5.19.tgz", + "integrity": "sha512-6+iaCMh/JXJaB2QWikqvGE9//wLEVYYwZd5sud8aLoLKog1Q75naZh2vlGVtg5Mq/NqpqGQvdIjJb3Bm+64AUQ==", + "dev": true, + "requires": { + "@oclif/config": "^1", + "@oclif/errors": "^1.2.2", + "@oclif/parser": "^3.8.3", + "@oclif/plugin-help": "^2", + "debug": "^4.1.1", + "semver": "^5.6.0" + } + }, "sinon": { "version": "6.3.5", "resolved": "https://registry.npmjs.org/sinon/-/sinon-6.3.5.tgz", @@ -3743,12 +3772,12 @@ "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==" }, "nise": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/nise/-/nise-1.5.0.tgz", - "integrity": "sha512-Z3sfYEkLFzFmL8KY6xnSJLRxwQwYBjOXi/24lb62ZnZiGA0JUzGGTI6TBIgfCSMIDl9Jlu8SRmHNACLTemDHww==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/nise/-/nise-1.5.2.tgz", + "integrity": "sha512-/6RhOUlicRCbE9s+94qCUsyE+pKlVJ5AhIv+jEE7ESKwnbXqulKZ1FYU+XAtHHWE9TinYvAxDUJAb912PwPoWA==", "dev": true, "requires": { - "@sinonjs/formatio": "^3.1.0", + "@sinonjs/formatio": "^3.2.1", "@sinonjs/text-encoding": "^0.7.1", "just-extend": "^4.0.2", "lolex": "^4.1.0", @@ -3756,9 +3785,9 @@ }, "dependencies": { "lolex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/lolex/-/lolex-4.1.0.tgz", - "integrity": "sha512-BYxIEXiVq5lGIXeVHnsFzqa1TxN5acnKnPCdlZSpzm8viNEOhiigupA4vTQ9HEFQ6nLTQ9wQOgBknJgzUYQ9Aw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lolex/-/lolex-4.2.0.tgz", + "integrity": "sha512-gKO5uExCXvSm6zbF562EvM+rd1kQDnB9AZBbiQVzf1ZmdDpxUSvpnAaVOP83N/31mRK8Ml8/VE8DMvsAZQ+7wg==", "dev": true } } diff --git a/package.json b/package.json index f6b7b39a4..6a3bd756e 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "@oclif/plugin-plugins": "^1.7.8", "@oclif/plugin-warn-if-update-available": "^1.7.0", "@sendgrid/mail": "^6.4.0", - "@twilio/cli-core": "^4.0.1", + "@twilio/cli-core": "^4.0.2", "@twilio/plugin-debugger": "^1.1.8", "chalk": "^2.4.2", "inquirer": "^6.5.2", @@ -25,7 +25,7 @@ "devDependencies": { "@oclif/dev-cli": "^1.22.2", "@oclif/test": "^1.2.5", - "@twilio/cli-test": "^2.0.0", + "@twilio/cli-test": "^2.0.1", "aws-sdk": "^2.523.0", "chai": "^4.2.0", "eslint": "^4.19.1", diff --git a/src/commands/phone-numbers/update.js b/src/commands/phone-numbers/update.js index c6c478dc5..e7927cee4 100644 --- a/src/commands/phone-numbers/update.js +++ b/src/commands/phone-numbers/update.js @@ -6,9 +6,9 @@ const { TwilioCliError } = require('@twilio/cli-core').services.error; const IncomingPhoneNumberHelper = require('../../services/resource-helpers/api/v2010/incoming-phone-number'); class NumberUpdate extends TwilioClientCommand { - constructor(argv, config, secureStorage, ngrok) { - super(argv, config, secureStorage); - this.ngrok = ngrok || require('ngrok'); + constructor(argv, config) { + super(argv, config); + this.ngrok = require('ngrok'); } async run() { diff --git a/test/commands/phone-numbers/update.test.js b/test/commands/phone-numbers/update.test.js index c7d82b442..ceec08f36 100644 --- a/test/commands/phone-numbers/update.test.js +++ b/test/commands/phone-numbers/update.test.js @@ -14,25 +14,15 @@ const fakeNumberUrl = `/2010-04-01/Accounts/${constants.FAKE_ACCOUNT_SID}/Incomi const fakeNgrokUrl = 'https://12345.ngrok.io'; -async function createCommand(ctx, args, useFakeNgrok) { - ctx.fakeNgrok = { - connect: sinon.fake.resolves(fakeNgrokUrl), - getUrl: () => {} - }; - - ctx.testCmd = new NumberUpdate( - args, - ctx.fakeConfig, - { - async getCredentials(profileId) { - return { - apiKey: constants.FAKE_API_KEY, - apiSecret: constants.FAKE_API_SECRET + profileId - }; - } - }, - useFakeNgrok ? ctx.fakeNgrok : undefined - ); +async function patchCommand(ctx, useFakeNgrok) { + if (useFakeNgrok) { + ctx.fakeNgrok = { + connect: sinon.fake.resolves(fakeNgrokUrl), + getUrl: () => {} + }; + + ctx.testCmd.ngrok = ctx.fakeNgrok; + } ctx.testCmd.inquirer.prompt = sinon.stub() .onFirstCall() @@ -53,8 +43,9 @@ describe('commands', () => { } }) .twilioCliEnv(Config) + .twilioCreateCommand(NumberUpdate, args) .stdout() - .do(ctx => createCommand(ctx, args, useFakeNgrok)); + .do(ctx => patchCommand(ctx, useFakeNgrok)); }; setUpTest([fakeNumberSid, '--friendly-name', 'MyPhoneNumber', '-o', 'tsv'])