Skip to content

Commit 3a90383

Browse files
authored
Bump dependencies (#366)
* Bump dependencies * Fix tests * Set timeout to 10s
1 parent 5310c11 commit 3a90383

File tree

5 files changed

+81
-51
lines changed

5 files changed

+81
-51
lines changed

CHANGELOG.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
1818

1919
### Changed
2020

21-
- Bumped dependencies, by [@compulim](https://github.com/compulim), in PR [#351](https://github.com/microsoft/BotFramework-DirectLineJS/pull/351)
21+
- Bumped dependencies, by [@compulim](https://github.com/compulim), in PR [#351](https://github.com/microsoft/BotFramework-DirectLineJS/pull/351) and PR [#366](https://github.com/microsoft/BotFramework-DirectLineJS/pull/366)
2222
- Production dependencies
2323
- [`@babel/runtime@7.14.8`](https://npmjs.com/package/@babel/runtime)
2424
- [`botframework-streaming@4.14.1`](https://npmjs.com/package/botframework-streaming)
2525
- [`buffer@6.0.3`](https://npmjs.com/package/buffer)
2626
- [`core-js@3.15.2`](https://npmjs.com/package/core-js)
27-
- [`cross-fetch@3.1.4`](https://npmjs.com/package/cross-fetch)
27+
- [`cross-fetch@3.1.5`](https://npmjs.com/package/cross-fetch)
2828
- [`rxjs@5.5.12`](https://npmjs.com/package/rxjs)
2929
- [`url-search-params-polyfill@8.1.1`](https://npmjs.com/package/url-search-params-polyfill)
3030
- Development dependencies
@@ -48,7 +48,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
4848
- [`jest-environment-jsdom@27.0.6`](https://npmjs.com/package/jest-environment-jsdom)
4949
- [`jsdom@16.6.0`](https://npmjs.com/package/jsdom)
5050
- [`nock@13.1.1`](https://npmjs.com/package/nock)
51-
- [`node-fetch@2.6.1`](https://npmjs.com/package/node-fetch)
51+
- [`node-fetch@2.6.7`](https://npmjs.com/package/node-fetch)
5252
- [`restify@8.5.1`](https://npmjs.com/package/restify)
5353
- [`rimraf@3.0.2`](https://npmjs.com/package/rimraf)
5454
- [`simple-update-in@2.2.0`](https://npmjs.com/package/simple-update-in)

__tests__/happy.uploadAttachmentStreams.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ import postActivity from './setup/postActivity';
99
import waitForBotToEcho from './setup/waitForBotToEcho';
1010
import waitForConnected from './setup/waitForConnected';
1111

12+
jest.setTimeout(10000);
13+
1214
describe('Happy path', () => {
1315
let unsubscribes;
1416

@@ -34,10 +36,10 @@ describe('Happy path', () => {
3436
// DirectLine.postActivityWithAttachments support "contentUrl" only but not "content"
3537
attachments: [{
3638
contentType: 'image/jpg',
37-
contentUrl: 'http://dljstestbot.azurewebsites.net/177KB.jpg'
39+
contentUrl: 'https://dljstestbot.azurewebsites.net/177KB.jpg'
3840
}, {
3941
contentType: 'image/jpg',
40-
contentUrl: 'http://dljstestbot.azurewebsites.net/100KB.jpg'
42+
contentUrl: 'https://dljstestbot.azurewebsites.net/100KB.jpg'
4143
}],
4244
text: 'Hello, World!',
4345
type: 'message',

__tests__/happy.uploadAttachments.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ import postActivity from './setup/postActivity';
99
import waitForBotToEcho from './setup/waitForBotToEcho';
1010
import waitForConnected from './setup/waitForConnected';
1111

12+
jest.setTimeout(10000);
13+
1214
describe('Happy path', () => {
1315
let unsubscribes;
1416

@@ -53,11 +55,11 @@ describe('Happy path', () => {
5355
// DirectLine.postActivityWithAttachments support "contentUrl" only but not "content"
5456
attachments: [{
5557
contentType: 'image/jpg',
56-
contentUrl: 'http://dljstestbot.azurewebsites.net/177KB.jpg',
58+
contentUrl: 'https://dljstestbot.azurewebsites.net/177KB.jpg',
5759
thumbnailUrl: 'data:image/png;base64,===177KB.jpg'
5860
}, {
5961
contentType: 'image/png',
60-
contentUrl: 'http://dljstestbot.azurewebsites.net/100KB.jpg',
62+
contentUrl: 'https://dljstestbot.azurewebsites.net/100KB.jpg',
6163
thumbnailUrl: 'data:image/png;base64,===100KB.jpb'
6264
}],
6365
text: 'Hello, World!',

package-lock.json

Lines changed: 68 additions & 42 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"botframework-streaming": "4.14.1",
3131
"buffer": "6.0.3",
3232
"core-js": "3.15.2",
33-
"cross-fetch": "3.1.4",
33+
"cross-fetch": "^3.1.5",
3434
"jwt-decode": "3.1.2",
3535
"rxjs": "5.5.12",
3636
"url-search-params-polyfill": "8.1.1"
@@ -60,7 +60,7 @@
6060
"jest-environment-jsdom": "^27.0.6",
6161
"jsdom": "^16.6.0",
6262
"nock": "^13.1.1",
63-
"node-fetch": "^2.6.1",
63+
"node-fetch": "^2.6.7",
6464
"on-error-resume-next": "^1.1.0",
6565
"restify": "^8.5.1",
6666
"rimraf": "^3.0.2",

0 commit comments

Comments
 (0)