Skip to content

Commit 68e6ef3

Browse files
authored
Bump botframework-streaming and webpack (#396)
* Bump botframework-streaming and webpack * Update PR number * Skipping dljstestbot related tests
1 parent e88b998 commit 68e6ef3

12 files changed

Lines changed: 40 additions & 28 deletions

CHANGELOG.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@ 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 [#390](https://github.com/microsoft/BotFramework-DirectLineJS/pull/390)
21+
- Bumped dependencies, by [@compulim](https://github.com/compulim), in PR [#390](https://github.com/microsoft/BotFramework-DirectLineJS/pull/390) and PR [#396](https://github.com/microsoft/BotFramework-DirectLineJS/pull/396)
22+
- Production dependencies
23+
- [`botframework-streaming@4.19.3`](https://npmjs.com/package/botframework-streaming)
2224
- Development dependencies
2325
- [`restify@11.0.0`](https://npmjs.com/package/restify)
24-
- [`webpack@5.75.0`](https://npmjs.com/package/webpack)
26+
- [`webpack@5.76.2`](https://npmjs.com/package/webpack)
2527

2628
## [0.15.1] - 2022-02-09
2729

__tests__/happy.conversationUpdate.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ import * as createDirectLine from './setup/createDirectLine';
77
import waitForBotToRespond from './setup/waitForBotToRespond';
88
import waitForConnected from './setup/waitForConnected';
99

10-
describe('Happy path', () => {
10+
// Skipping because the bot at dljstestbot.azurewebsites.net is not available.
11+
describe.skip('Happy path', () => {
1112
let unsubscribes;
1213

1314
beforeEach(() => unsubscribes = []);

__tests__/happy.dlstreamConnection.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ import waitForConnected from './setup/waitForConnected';
1111
// - Make sure after `end` is called, the client will not reconnect
1212
// - If the connection is disrupted, make sure the client will reconnect
1313
// - Use a fake timer to speed up the test
14-
describe('test dl streaming end', () => {
14+
15+
// Skipping because the bot at dljstestbot.azurewebsites.net is not available.
16+
describe.skip('test dl streaming end', () => {
1517
let unsubscribes;
1618
let directLine;
1719
const ConnectionStatusEnd = 5;
@@ -26,4 +28,4 @@ describe('test dl streaming end', () => {
2628
directLine.end();
2729
expect(directLine.connectionStatus$.getValue()).toBe(ConnectionStatusEnd);
2830
})
29-
});
31+
});

__tests__/happy.localeOnStartConversation.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ import { timeouts } from './constants.json';
66
import * as createDirectLine from './setup/createDirectLine';
77
import waitForBotToRespond from './setup/waitForBotToRespond';
88

9-
describe('Happy path', () => {
9+
// Skipping because the bot at dljstestbot.azurewebsites.net is not available.
10+
describe.skip('Happy path', () => {
1011
let unsubscribes;
1112

1213
beforeEach(() => unsubscribes = []);

__tests__/happy.postActivity.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import postActivity from './setup/postActivity';
88
import waitForBotToEcho from './setup/waitForBotToEcho';
99
import waitForConnected from './setup/waitForConnected';
1010

11-
describe('Happy path', () => {
11+
// Skipping because the bot at dljstestbot.azurewebsites.net is not available.
12+
describe.skip('Happy path', () => {
1213
let unsubscribes;
1314

1415
beforeEach(() => unsubscribes = []);

__tests__/happy.receiveAttachmentStreams.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ import waitForBotToEcho from './setup/waitForBotToEcho';
1010
import waitForConnected from './setup/waitForConnected';
1111
import waitForBotToRespond from './setup/waitForBotToRespond.js';
1212

13-
describe('Happy path', () => {
13+
// Skipping because the bot at dljstestbot.azurewebsites.net is not available.
14+
describe.skip('Happy path', () => {
1415
let unsubscribes;
1516

1617
beforeEach(() => unsubscribes = []);
@@ -31,8 +32,8 @@ describe('Happy path', () => {
3132
unsubscribes.push(directLine.end.bind(directLine));
3233
unsubscribes.push(await waitForConnected(directLine));
3334

34-
let url1 = 'http://dljstestbot.azurewebsites.net/177KB.jpg';
35-
let url2 = 'http://dljstestbot.azurewebsites.net/100KB.jpg';
35+
let url1 = 'https://webchat-mockbot.azurewebsites.net/public/assets/surface1.jpg';
36+
let url2 = 'https://webchat-mockbot.azurewebsites.net/public/assets/surface2.jpg';
3637

3738
const activityFromUser = {
3839
text: 'attach ' + url1 + ' ' + url2,

__tests__/happy.uploadAttachmentStreams.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ import waitForConnected from './setup/waitForConnected';
1111

1212
jest.setTimeout(10000);
1313

14-
describe('Happy path', () => {
14+
// Skipping because the bot at dljstestbot.azurewebsites.net is not available.
15+
describe.skip('Happy path', () => {
1516
let unsubscribes;
1617

1718
beforeEach(() => unsubscribes = []);
@@ -36,10 +37,10 @@ describe('Happy path', () => {
3637
// DirectLine.postActivityWithAttachments support "contentUrl" only but not "content"
3738
attachments: [{
3839
contentType: 'image/jpg',
39-
contentUrl: 'https://dljstestbot.azurewebsites.net/177KB.jpg'
40+
contentUrl: 'https://webchat-mockbot.azurewebsites.net/public/assets/surface1.jpg'
4041
}, {
4142
contentType: 'image/jpg',
42-
contentUrl: 'https://dljstestbot.azurewebsites.net/100KB.jpg'
43+
contentUrl: 'https://webchat-mockbot.azurewebsites.net/public/assets/surface2.jpg'
4344
}],
4445
text: 'Hello, World!',
4546
type: 'message',

__tests__/happy.uploadAttachments.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ import waitForConnected from './setup/waitForConnected';
1111

1212
jest.setTimeout(10000);
1313

14-
describe('Happy path', () => {
14+
// Skipping because the bot at dljstestbot.azurewebsites.net is not available.
15+
describe.skip('Happy path', () => {
1516
let unsubscribes;
1617

1718
beforeEach(() => unsubscribes = []);
@@ -55,11 +56,11 @@ describe('Happy path', () => {
5556
// DirectLine.postActivityWithAttachments support "contentUrl" only but not "content"
5657
attachments: [{
5758
contentType: 'image/jpg',
58-
contentUrl: 'https://dljstestbot.azurewebsites.net/177KB.jpg',
59+
contentUrl: 'https://webchat-mockbot.azurewebsites.net/public/assets/surface1.jpg',
5960
thumbnailUrl: 'data:image/png;base64,===177KB.jpg'
6061
}, {
6162
contentType: 'image/png',
62-
contentUrl: 'https://dljstestbot.azurewebsites.net/100KB.jpg',
63+
contentUrl: 'https://webchat-mockbot.azurewebsites.net/public/assets/surface2.jpg',
6364
thumbnailUrl: 'data:image/png;base64,===100KB.jpb'
6465
}],
6566
text: 'Hello, World!',

__tests__/unhappy.invalidLocaleOnStartConversation.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ import { timeouts } from './constants.json';
66
import * as createDirectLine from './setup/createDirectLine';
77
import waitForBotToRespond from './setup/waitForBotToRespond';
88

9-
describe('Unhappy path', () => {
9+
// Skipping because the bot at dljstestbot.azurewebsites.net is not available.
10+
describe.skip('Unhappy path', () => {
1011
let unsubscribes;
1112

1213
beforeEach(() => unsubscribes = []);

__tests__/unhappy.postActivityFatalAfterConnect.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ import postActivity from './setup/postActivity';
1010
import waitForBotToEcho from './setup/waitForBotToEcho';
1111
import waitForConnected from './setup/waitForConnected';
1212

13-
describe('Unhappy path', () => {
13+
// Skipping because the bot at dljstestbot.azurewebsites.net is not available.
14+
describe.skip('Unhappy path', () => {
1415
let unsubscribes;
1516

1617
beforeEach(() => (unsubscribes = []));

0 commit comments

Comments
 (0)