Skip to content

BotService: fix tests, improve test robustness and update recordings #7941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tjprescott merged 3 commits into from
Nov 29, 2018
Merged

BotService: fix tests, improve test robustness and update recordings #7941

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c72ae6f
BotService: fix tests, mprove test robustness and update recordings
carlosscastro Nov 29, 2018
0b8fcbb
BotService; fixing tests
carlosscastro Nov 29, 2018
067d650
BotService: Update recordings
carlosscastro Nov 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
BotService; fixing tests
  • Loading branch information
@carlosscastro
carlosscastro committed Nov 29, 2018
commit 0b8fcbb1a1b52e42908ffd4bac2d1a5995c55d3f
162 changes: 57 additions & 105 deletions ...rvice/azure/cli/command_modules/botservice/tests/latest/recordings/test_auth_setting.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1,087 changes: 554 additions & 533 deletions .../cli/command_modules/botservice/tests/latest/recordings/test_create_v3_js_webapp_bot.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2,016 changes: 1,006 additions & 1,010 deletions ...ure/cli/command_modules/botservice/tests/latest/recordings/test_create_v3_webapp_bot.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6,313 changes: 3,155 additions & 3,158 deletions .../cli/command_modules/botservice/tests/latest/recordings/test_create_v4_js_webapp_bot.yaml
View file
Open in desktop

Large diffs are not rendered by default.

315,455 changes: 157,726 additions & 157,729 deletions ...ure/cli/command_modules/botservice/tests/latest/recordings/test_create_v4_webapp_bot.yaml
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions ...sts/latest/recordings/test_prepare_publish_should_raise_cli_error_when_version_is_v4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
interactions:
- request:
body: '{"location": "westus", "tags": {"product": "azurecli", "date": "2018-11-29T06:03:01Z",
"cause": "automation"}}'
body: '{"tags": {"date": "2018-11-29T08:15:34Z", "product": "azurecli", "cause":
"automation"}, "location": "westus"}'
headers:
Accept: [application/json]
Accept-Encoding: ['gzip, deflate']
Expand All @@ -16,12 +16,12 @@ interactions:
method: PUT
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01
response:
body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","date":"2018-11-29T06:03:01Z","cause":"automation"},"properties":{"provisioningState":"Succeeded"}}'}
body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"date":"2018-11-29T08:15:34Z","product":"azurecli","cause":"automation"},"properties":{"provisioningState":"Succeeded"}}'}
headers:
cache-control: [no-cache]
content-length: ['274']
content-type: [application/json; charset=utf-8]
date: ['Thu, 29 Nov 2018 06:03:02 GMT']
date: ['Thu, 29 Nov 2018 08:15:35 GMT']
expires: ['-1']
pragma: [no-cache]
strict-transport-security: [max-age=31536000; includeSubDomains]
Expand All @@ -46,7 +46,7 @@ interactions:
body: {string: ''}
headers:
cache-control: [no-cache]
date: ['Thu, 29 Nov 2018 06:03:02 GMT']
date: ['Thu, 29 Nov 2018 08:15:35 GMT']
expires: ['-1']
pragma: [no-cache]
strict-transport-security: [max-age=31536000; includeSubDomains]
Expand All @@ -71,12 +71,12 @@ interactions:
body: {string: ''}
headers:
cache-control: [no-cache]
date: ['Thu, 29 Nov 2018 06:03:03 GMT']
date: ['Thu, 29 Nov 2018 08:15:36 GMT']
expires: ['-1']
pragma: [no-cache]
strict-transport-security: [max-age=31536000; includeSubDomains]
x-content-type-options: [nosniff]
x-ms-ratelimit-remaining-subscription-deletes: ['14998']
x-ms-ratelimit-remaining-subscription-deletes: ['14999']
status: {code: 204, message: No Content}
- request:
body: null
Expand All @@ -98,12 +98,12 @@ interactions:
headers:
cache-control: [no-cache]
content-length: ['0']
date: ['Thu, 29 Nov 2018 06:03:03 GMT']
date: ['Thu, 29 Nov 2018 08:15:36 GMT']
expires: ['-1']
location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTElURVNUOjJFUkdHN09DSDNNNk1DLVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01']
location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTElURVNUOjJFUkdHS1JNMjZNRUJFLVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01']
pragma: [no-cache]
strict-transport-security: [max-age=31536000; includeSubDomains]
x-content-type-options: [nosniff]
x-ms-ratelimit-remaining-subscription-deletes: ['14999']
x-ms-ratelimit-remaining-subscription-deletes: ['14998']
status: {code: 202, message: Accepted}
version: 1
44 changes: 22 additions & 22 deletions ...ests/latest/recordings/test_prepare_publish_with_registration_bot_should_raise_error.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
interactions:
- request:
body: '{"location": "westus", "tags": {"product": "azurecli", "date": "2018-11-29T06:03:04Z",
"cause": "automation"}}'
body: '{"tags": {"date": "2018-11-29T08:15:37Z", "product": "azurecli", "cause":
"automation"}, "location": "westus"}'
headers:
Accept: [application/json]
Accept-Encoding: ['gzip, deflate']
Expand All @@ -16,23 +16,23 @@ interactions:
method: PUT
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01
response:
body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","date":"2018-11-29T06:03:04Z","cause":"automation"},"properties":{"provisioningState":"Succeeded"}}'}
body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"date":"2018-11-29T08:15:37Z","product":"azurecli","cause":"automation"},"properties":{"provisioningState":"Succeeded"}}'}
headers:
cache-control: [no-cache]
content-length: ['274']
content-type: [application/json; charset=utf-8]
date: ['Thu, 29 Nov 2018 06:03:04 GMT']
date: ['Thu, 29 Nov 2018 08:15:38 GMT']
expires: ['-1']
pragma: [no-cache]
strict-transport-security: [max-age=31536000; includeSubDomains]
x-content-type-options: [nosniff]
x-ms-ratelimit-remaining-subscription-writes: ['1199']
x-ms-ratelimit-remaining-subscription-writes: ['1198']
status: {code: 201, message: Created}
- request:
body: 'b''{"kind": "bot", "tags": {"key1": "value1"}, "sku": {"name": "F0"}, "location":
"global", "properties": {"msaAppId": "4d187e13-193f-48b2-8ab8-70a015093f36",
"endpoint": "https://www.google.com/api/messages", "displayName": "cli000002",
"description": "description1"}}'''
body: 'b''{"tags": {"key1": "value1"}, "properties": {"displayName": "cli000002",
"description": "description1", "msaAppId": "c9617e5f-5d76-46bb-a147-cf30f5a1c796",
"endpoint": "https://www.google.com/api/messages"}, "kind": "bot", "sku": {"name":
"F0"}, "location": "global"}'''
headers:
Accept: [application/json]
Accept-Encoding: ['gzip, deflate']
Expand All @@ -47,13 +47,13 @@ interactions:
method: PUT
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002?api-version=2018-07-12
response:
body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002","name":"cli000002","type":"Microsoft.BotService/botServices","etag":"W/\"datetime''2018-11-29T06%3A03%3A06.9877232Z''\"","location":"global","sku":{"name":"F0"},"kind":"bot","tags":{"key1":"value1"},"properties":{"displayName":"cli000002","description":"description1","iconUrl":"https://docs.botframework.com/static/devportal/client/images/bot-framework-default.png","endpoint":"https://www.google.com/api/messages","msaAppId":"4d187e13-193f-48b2-8ab8-70a015093f36","developerAppInsightKey":"","developerAppInsightsApplicationId":"","luisAppIds":[],"endpointVersion":"3.0","configuredChannels":["webchat"],"enabledChannels":["webchat","directline"],"isDeveloperAppInsightsApiKeySet":false,"publishingCredentials":null,"parameters":null,"allSettings":null,"manifestUrl":"","storageResourceId":null,"provisioningState":"Succeeded"}}'}
body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002","name":"cli000002","type":"Microsoft.BotService/botServices","etag":"W/\"datetime''2018-11-29T08%3A15%3A40.6193642Z''\"","location":"global","sku":{"name":"F0"},"kind":"bot","tags":{"key1":"value1"},"properties":{"displayName":"cli000002","description":"description1","iconUrl":"https://docs.botframework.com/static/devportal/client/images/bot-framework-default.png","endpoint":"https://www.google.com/api/messages","msaAppId":"c9617e5f-5d76-46bb-a147-cf30f5a1c796","developerAppInsightKey":"","developerAppInsightsApplicationId":"","luisAppIds":[],"endpointVersion":"3.0","configuredChannels":["webchat"],"enabledChannels":["webchat","directline"],"isDeveloperAppInsightsApiKeySet":false,"publishingCredentials":null,"parameters":null,"allSettings":null,"manifestUrl":"","storageResourceId":null,"provisioningState":"Succeeded"}}'}
headers:
cache-control: [no-cache]
content-length: ['980']
content-type: [application/json; charset=utf-8]
date: ['Thu, 29 Nov 2018 06:03:07 GMT']
etag: [W/"datetime'2018-11-29T06%3A03%3A06.9877232Z'"]
date: ['Thu, 29 Nov 2018 08:15:40 GMT']
etag: [W/"datetime'2018-11-29T08%3A15%3A40.6193642Z'"]
expires: ['-1']
pragma: [no-cache]
server: [Microsoft-IIS/10.0]
Expand All @@ -75,13 +75,13 @@ interactions:
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002?api-version=2018-07-12
response:
body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002","name":"cli000002","type":"Microsoft.BotService/botServices","etag":"W/\"datetime''2018-11-29T06%3A03%3A06.9877232Z''\"","location":"global","sku":{"name":"F0"},"kind":"bot","tags":{"key1":"value1"},"properties":{"displayName":"cli000002","description":"description1","iconUrl":"https://docs.botframework.com/static/devportal/client/images/bot-framework-default.png","endpoint":"https://www.google.com/api/messages","msaAppId":"4d187e13-193f-48b2-8ab8-70a015093f36","developerAppInsightKey":"","developerAppInsightsApplicationId":"","luisAppIds":[],"endpointVersion":"3.0","configuredChannels":["webchat"],"enabledChannels":["webchat","directline"],"isDeveloperAppInsightsApiKeySet":false,"publishingCredentials":null,"parameters":null,"allSettings":null,"manifestUrl":"","storageResourceId":null,"provisioningState":"Succeeded"}}'}
body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002","name":"cli000002","type":"Microsoft.BotService/botServices","etag":"W/\"datetime''2018-11-29T08%3A15%3A40.6193642Z''\"","location":"global","sku":{"name":"F0"},"kind":"bot","tags":{"key1":"value1"},"properties":{"displayName":"cli000002","description":"description1","iconUrl":"https://docs.botframework.com/static/devportal/client/images/bot-framework-default.png","endpoint":"https://www.google.com/api/messages","msaAppId":"c9617e5f-5d76-46bb-a147-cf30f5a1c796","developerAppInsightKey":"","developerAppInsightsApplicationId":"","luisAppIds":[],"endpointVersion":"3.0","configuredChannels":["webchat"],"enabledChannels":["webchat","directline"],"isDeveloperAppInsightsApiKeySet":false,"publishingCredentials":null,"parameters":null,"allSettings":null,"manifestUrl":"","storageResourceId":null,"provisioningState":"Succeeded"}}'}
headers:
cache-control: [no-cache]
content-length: ['980']
content-type: [application/json; charset=utf-8]
date: ['Thu, 29 Nov 2018 06:03:07 GMT']
etag: [W/"datetime'2018-11-29T06%3A03%3A06.9877232Z'"]
date: ['Thu, 29 Nov 2018 08:15:41 GMT']
etag: [W/"datetime'2018-11-29T08%3A15%3A40.6193642Z'"]
expires: ['-1']
pragma: [no-cache]
server: [Microsoft-IIS/10.0]
Expand All @@ -104,13 +104,13 @@ interactions:
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002?api-version=2018-07-12
response:
body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002","name":"cli000002","type":"Microsoft.BotService/botServices","etag":"W/\"datetime''2018-11-29T06%3A03%3A06.9877232Z''\"","location":"global","sku":{"name":"F0"},"kind":"bot","tags":{"key1":"value1"},"properties":{"displayName":"cli000002","description":"description1","iconUrl":"https://docs.botframework.com/static/devportal/client/images/bot-framework-default.png","endpoint":"https://www.google.com/api/messages","msaAppId":"4d187e13-193f-48b2-8ab8-70a015093f36","developerAppInsightKey":"","developerAppInsightsApplicationId":"","luisAppIds":[],"endpointVersion":"3.0","configuredChannels":["webchat"],"enabledChannels":["webchat","directline"],"isDeveloperAppInsightsApiKeySet":false,"publishingCredentials":null,"parameters":null,"allSettings":null,"manifestUrl":"","storageResourceId":null,"provisioningState":"Succeeded"}}'}
body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002","name":"cli000002","type":"Microsoft.BotService/botServices","etag":"W/\"datetime''2018-11-29T08%3A15%3A40.6193642Z''\"","location":"global","sku":{"name":"F0"},"kind":"bot","tags":{"key1":"value1"},"properties":{"displayName":"cli000002","description":"description1","iconUrl":"https://docs.botframework.com/static/devportal/client/images/bot-framework-default.png","endpoint":"https://www.google.com/api/messages","msaAppId":"c9617e5f-5d76-46bb-a147-cf30f5a1c796","developerAppInsightKey":"","developerAppInsightsApplicationId":"","luisAppIds":[],"endpointVersion":"3.0","configuredChannels":["webchat"],"enabledChannels":["webchat","directline"],"isDeveloperAppInsightsApiKeySet":false,"publishingCredentials":null,"parameters":null,"allSettings":null,"manifestUrl":"","storageResourceId":null,"provisioningState":"Succeeded"}}'}
headers:
cache-control: [no-cache]
content-length: ['980']
content-type: [application/json; charset=utf-8]
date: ['Thu, 29 Nov 2018 06:03:07 GMT']
etag: [W/"datetime'2018-11-29T06%3A03%3A06.9877232Z'"]
date: ['Thu, 29 Nov 2018 08:15:41 GMT']
etag: [W/"datetime'2018-11-29T08%3A15%3A40.6193642Z'"]
expires: ['-1']
pragma: [no-cache]
server: [Microsoft-IIS/10.0]
Expand Down Expand Up @@ -138,13 +138,13 @@ interactions:
headers:
cache-control: [no-cache]
content-length: ['0']
date: ['Thu, 29 Nov 2018 06:03:11 GMT']
date: ['Thu, 29 Nov 2018 08:15:45 GMT']
expires: ['-1']
pragma: [no-cache]
server: [Microsoft-IIS/10.0]
strict-transport-security: [max-age=31536000; includeSubDomains]
x-content-type-options: [nosniff]
x-ms-ratelimit-remaining-subscription-deletes: ['14999']
x-ms-ratelimit-remaining-subscription-deletes: ['14998']
status: {code: 200, message: OK}
- request:
body: null
Expand All @@ -166,9 +166,9 @@ interactions:
headers:
cache-control: [no-cache]
content-length: ['0']
date: ['Thu, 29 Nov 2018 06:03:11 GMT']
date: ['Thu, 29 Nov 2018 08:15:45 GMT']
expires: ['-1']
location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTElURVNUOjJFUkc2TE5QRVNKMllFLVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01']
location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTElURVNUOjJFUkdIWjNETVQzMjI2LVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01']
pragma: [no-cache]
strict-transport-security: [max-age=31536000; includeSubDomains]
x-content-type-options: [nosniff]
Expand Down
14 changes: 7 additions & 7 deletions .../tests/latest/recordings/test_prepare_publish_with_unregistered_bot_name_should_fail.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
interactions:
- request:
body: '{"location": "westus", "tags": {"product": "azurecli", "date": "2018-11-29T06:03:12Z",
"cause": "automation"}}'
body: '{"tags": {"date": "2018-11-29T08:15:46Z", "product": "azurecli", "cause":
"automation"}, "location": "westus"}'
headers:
Accept: [application/json]
Accept-Encoding: ['gzip, deflate']
Expand All @@ -16,12 +16,12 @@ interactions:
method: PUT
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01
response:
body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","date":"2018-11-29T06:03:12Z","cause":"automation"},"properties":{"provisioningState":"Succeeded"}}'}
body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"date":"2018-11-29T08:15:46Z","product":"azurecli","cause":"automation"},"properties":{"provisioningState":"Succeeded"}}'}
headers:
cache-control: [no-cache]
content-length: ['274']
content-type: [application/json; charset=utf-8]
date: ['Thu, 29 Nov 2018 06:03:12 GMT']
date: ['Thu, 29 Nov 2018 08:15:46 GMT']
expires: ['-1']
pragma: [no-cache]
strict-transport-security: [max-age=31536000; includeSubDomains]
Expand All @@ -48,7 +48,7 @@ interactions:
cache-control: [no-cache]
content-length: ['167']
content-type: [application/json; charset=utf-8]
date: ['Thu, 29 Nov 2018 06:03:12 GMT']
date: ['Thu, 29 Nov 2018 08:15:46 GMT']
expires: ['-1']
pragma: [no-cache]
strict-transport-security: [max-age=31536000; includeSubDomains]
Expand All @@ -75,9 +75,9 @@ interactions:
headers:
cache-control: [no-cache]
content-length: ['0']
date: ['Thu, 29 Nov 2018 06:03:14 GMT']
date: ['Thu, 29 Nov 2018 08:15:47 GMT']
expires: ['-1']
location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTElURVNUOjJFUkdBWDNGRDdMNEFDLVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01']
location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTElURVNUOjJFUkdJTERFUEEyM1AzLVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01']
pragma: [no-cache]
strict-transport-security: [max-age=31536000; includeSubDomains]
x-content-type-options: [nosniff]
Expand Down
Loading