From 13255f845b6988dbe9ee76ed17566a376471037c Mon Sep 17 00:00:00 2001 From: Charles Gagnon Date: Tue, 9 Feb 2021 08:35:47 -0800 Subject: [PATCH] Update azdata-test to official Microsoft org version (#14203) --- extensions/arc/package.json | 2 +- .../src/test/ui/components/filePicker.test.ts | 4 ++-- .../ui/components/radioOptionsGroup.test.ts | 4 ++-- extensions/arc/yarn.lock | 20 +++++++++---------- extensions/resource-deployment/package.json | 2 +- .../test/ui/validation/modelViewUtils.test.ts | 6 +++--- extensions/resource-deployment/yarn.lock | 20 +++++++++---------- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/extensions/arc/package.json b/extensions/arc/package.json index 8b57a79844..7a928a2fd2 100644 --- a/extensions/arc/package.json +++ b/extensions/arc/package.json @@ -1127,7 +1127,7 @@ "@types/sinon": "^9.0.4", "@types/uuid": "^8.3.0", "@types/yamljs": "^0.2.31", - "azdata-test": "^1.1.1", + "@microsoft/azdata-test": "^1.4.0", "mocha": "^5.2.0", "mocha-junit-reporter": "^1.17.0", "mocha-multi-reporters": "^1.1.7", diff --git a/extensions/arc/src/test/ui/components/filePicker.test.ts b/extensions/arc/src/test/ui/components/filePicker.test.ts index b4a36ca481..72e80e10fd 100644 --- a/extensions/arc/src/test/ui/components/filePicker.test.ts +++ b/extensions/arc/src/test/ui/components/filePicker.test.ts @@ -9,8 +9,8 @@ import * as sinon from 'sinon'; import * as vscode from 'vscode'; import { Deferred } from '../../../common/promise'; import { FilePicker } from '../../../ui/components/filePicker'; -import { createModelViewMock } from 'azdata-test/out/mocks/modelView/modelViewMock'; -import { StubButton } from 'azdata-test/out/stubs/modelView/stubButton'; +import { createModelViewMock } from '@microsoft/azdata-test/out/mocks/modelView/modelViewMock'; +import { StubButton } from '@microsoft/azdata-test/out/stubs/modelView/stubButton'; let filePicker: FilePicker; const initialPath = path.join('path', 'to', '.kube','config'); diff --git a/extensions/arc/src/test/ui/components/radioOptionsGroup.test.ts b/extensions/arc/src/test/ui/components/radioOptionsGroup.test.ts index f943b6accb..a45473f2c2 100644 --- a/extensions/arc/src/test/ui/components/radioOptionsGroup.test.ts +++ b/extensions/arc/src/test/ui/components/radioOptionsGroup.test.ts @@ -7,8 +7,8 @@ import * as azdata from 'azdata'; import * as should from 'should'; import { getErrorMessage } from '../../../common/utils'; import { RadioOptionsGroup, RadioOptionsInfo } from '../../../ui/components/radioOptionsGroup'; -import { createModelViewMock } from 'azdata-test/out/mocks/modelView/modelViewMock'; -import { StubRadioButton } from 'azdata-test/out/stubs/modelView/stubRadioButton'; +import { createModelViewMock } from '@microsoft/azdata-test/out/mocks/modelView/modelViewMock'; +import { StubRadioButton } from '@microsoft/azdata-test/out/stubs/modelView/stubRadioButton'; const loadingError = new Error('Error loading options'); diff --git a/extensions/arc/yarn.lock b/extensions/arc/yarn.lock index c8efb37cb4..305ad92020 100644 --- a/extensions/arc/yarn.lock +++ b/extensions/arc/yarn.lock @@ -182,6 +182,16 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== +"@microsoft/azdata-test@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-1.4.0.tgz#a809187ae8a065c518e3a3e2d350883e592853bc" + integrity sha512-iscDA13/XRknRCNauP9OPsSg/ulTrMJOPFA0XMyNG1it3zY8mEJxxFJcNkWTnnEWpOUFvyksvoouzYUNy1fvrQ== + dependencies: + http-proxy-agent "^2.1.0" + https-proxy-agent "^2.2.4" + rimraf "^2.6.3" + typemoq "^2.1.0" + "@sinonjs/commons@^1", "@sinonjs/commons@^1.6.0", "@sinonjs/commons@^1.7.0", "@sinonjs/commons@^1.7.2": version "1.8.0" resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.0.tgz#c8d68821a854c555bba172f3b06959a0039b236d" @@ -345,16 +355,6 @@ aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e" integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug== -azdata-test@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/azdata-test/-/azdata-test-1.1.1.tgz#0feb13ec01397841f7bbce0ad25a41e4a3afb5b5" - integrity sha512-+jZ5/4Orqt5Q2MLPqmV+iQjGYxG5FK4pC3UqTOPdSzlbs0JQhOXckC8Hmw8ZOS0N6Cn7mNDCpfaqEU9coTyVsw== - dependencies: - http-proxy-agent "^2.1.0" - https-proxy-agent "^2.2.4" - rimraf "^2.6.3" - typemoq "^2.1.0" - balanced-match@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" diff --git a/extensions/resource-deployment/package.json b/extensions/resource-deployment/package.json index e192cb7e66..b632848caf 100644 --- a/extensions/resource-deployment/package.json +++ b/extensions/resource-deployment/package.json @@ -616,7 +616,7 @@ "@types/semver": "^7.3.1", "@types/sinon": "^9.0.8", "@types/yamljs": "0.2.30", - "azdata-test": "^1.1.1", + "@microsoft/azdata-test": "^1.4.0", "mocha": "^5.2.0", "mocha-junit-reporter": "^1.17.0", "mocha-multi-reporters": "^1.1.7", diff --git a/extensions/resource-deployment/src/test/ui/validation/modelViewUtils.test.ts b/extensions/resource-deployment/src/test/ui/validation/modelViewUtils.test.ts index 8eabaed7c0..58c0929e05 100644 --- a/extensions/resource-deployment/src/test/ui/validation/modelViewUtils.test.ts +++ b/extensions/resource-deployment/src/test/ui/validation/modelViewUtils.test.ts @@ -11,9 +11,9 @@ import { initializeWizardPage, InputComponent, InputComponentInfo, Validator, Wi import { FieldType } from '../../../interfaces'; import { IToolsService } from '../../../services/toolsService'; import { Deferred } from '../../utils'; -import { createModelViewMock } from 'azdata-test/out/mocks/modelView/modelViewMock'; -import { StubCheckbox } from 'azdata-test/out/stubs/modelView/stubCheckbox'; -import { StubInputBox } from 'azdata-test/out/stubs/modelView/stubInputBox'; +import { createModelViewMock } from '@microsoft/azdata-test/out/mocks/modelView/modelViewMock'; +import { StubCheckbox } from '@microsoft/azdata-test/out/stubs/modelView/stubCheckbox'; +import { StubInputBox } from '@microsoft/azdata-test/out/stubs/modelView/stubInputBox'; import * as should from 'should'; import * as sinon from 'sinon'; diff --git a/extensions/resource-deployment/yarn.lock b/extensions/resource-deployment/yarn.lock index b2825df821..3b1d8c7d93 100644 --- a/extensions/resource-deployment/yarn.lock +++ b/extensions/resource-deployment/yarn.lock @@ -189,6 +189,16 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== +"@microsoft/azdata-test@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-1.4.0.tgz#a809187ae8a065c518e3a3e2d350883e592853bc" + integrity sha512-iscDA13/XRknRCNauP9OPsSg/ulTrMJOPFA0XMyNG1it3zY8mEJxxFJcNkWTnnEWpOUFvyksvoouzYUNy1fvrQ== + dependencies: + http-proxy-agent "^2.1.0" + https-proxy-agent "^2.2.4" + rimraf "^2.6.3" + typemoq "^2.1.0" + "@sinonjs/commons@^1", "@sinonjs/commons@^1.6.0", "@sinonjs/commons@^1.7.0", "@sinonjs/commons@^1.8.1": version "1.8.1" resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz#e7df00f98a203324f6dc7cc606cad9d4a8ab2217" @@ -285,16 +295,6 @@ argparse@^1.0.7: dependencies: sprintf-js "~1.0.2" -azdata-test@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/azdata-test/-/azdata-test-1.1.1.tgz#0feb13ec01397841f7bbce0ad25a41e4a3afb5b5" - integrity sha512-+jZ5/4Orqt5Q2MLPqmV+iQjGYxG5FK4pC3UqTOPdSzlbs0JQhOXckC8Hmw8ZOS0N6Cn7mNDCpfaqEU9coTyVsw== - dependencies: - http-proxy-agent "^2.1.0" - https-proxy-agent "^2.2.4" - rimraf "^2.6.3" - typemoq "^2.1.0" - balanced-match@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"