Skip to content

Bump botframework-streaming and webpack #396

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
compulim merged 3 commits into from
Mar 21, 2023
Merged

Bump botframework-streaming and webpack #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23167c0
Bump botframework-streaming and webpack
compulim Mar 21, 2023
5302c0e
Update PR number
compulim Mar 21, 2023
16ccbba
Skipping dljstestbot related tests
compulim Mar 21, 2023
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
6 changes: 4 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

### Changed

- Bumped dependencies, by [@compulim](https://github.com/compulim), in PR [#390](https://github.com/microsoft/BotFramework-DirectLineJS/pull/390)
- 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)
- Production dependencies
- [`botframework-streaming@4.19.3`](https://npmjs.com/package/botframework-streaming)
- Development dependencies
- [`restify@11.0.0`](https://npmjs.com/package/restify)
- [`webpack@5.75.0`](https://npmjs.com/package/webpack)
- [`webpack@5.76.2`](https://npmjs.com/package/webpack)

## [0.15.1] - 2022-02-09

Expand Down
3 changes: 2 additions & 1 deletion __tests__/happy.conversationUpdate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import * as createDirectLine from './setup/createDirectLine';
import waitForBotToRespond from './setup/waitForBotToRespond';
import waitForConnected from './setup/waitForConnected';

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

beforeEach(() => unsubscribes = []);
Expand Down
6 changes: 4 additions & 2 deletions __tests__/happy.dlstreamConnection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ import waitForConnected from './setup/waitForConnected';
// - Make sure after `end` is called, the client will not reconnect
// - If the connection is disrupted, make sure the client will reconnect
// - Use a fake timer to speed up the test
describe('test dl streaming end', () => {

// Skipping because the bot at dljstestbot.azurewebsites.net is not available.
describe.skip('test dl streaming end', () => {
let unsubscribes;
let directLine;
const ConnectionStatusEnd = 5;
Expand All @@ -26,4 +28,4 @@ describe('test dl streaming end', () => {
directLine.end();
expect(directLine.connectionStatus$.getValue()).toBe(ConnectionStatusEnd);
})
});
});
3 changes: 2 additions & 1 deletion __tests__/happy.localeOnStartConversation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import { timeouts } from './constants.json';
import * as createDirectLine from './setup/createDirectLine';
import waitForBotToRespond from './setup/waitForBotToRespond';

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

beforeEach(() => unsubscribes = []);
Expand Down
3 changes: 2 additions & 1 deletion __tests__/happy.postActivity.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ import postActivity from './setup/postActivity';
import waitForBotToEcho from './setup/waitForBotToEcho';
import waitForConnected from './setup/waitForConnected';

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

beforeEach(() => unsubscribes = []);
Expand Down
7 changes: 4 additions & 3 deletions __tests__/happy.receiveAttachmentStreams.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ import waitForBotToEcho from './setup/waitForBotToEcho';
import waitForConnected from './setup/waitForConnected';
import waitForBotToRespond from './setup/waitForBotToRespond.js';

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

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

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

const activityFromUser = {
text: 'attach ' + url1 + ' ' + url2,
Expand Down
7 changes: 4 additions & 3 deletions __tests__/happy.uploadAttachmentStreams.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ import waitForConnected from './setup/waitForConnected';

jest.setTimeout(10000);

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

beforeEach(() => unsubscribes = []);
Expand All @@ -36,10 +37,10 @@ describe('Happy path', () => {
// DirectLine.postActivityWithAttachments support "contentUrl" only but not "content"
attachments: [{
contentType: 'image/jpg',
contentUrl: 'https://dljstestbot.azurewebsites.net/177KB.jpg'
contentUrl: 'https://webchat-mockbot.azurewebsites.net/public/assets/surface1.jpg'
}, {
contentType: 'image/jpg',
contentUrl: 'https://dljstestbot.azurewebsites.net/100KB.jpg'
contentUrl: 'https://webchat-mockbot.azurewebsites.net/public/assets/surface2.jpg'
}],
text: 'Hello, World!',
type: 'message',
Expand Down
7 changes: 4 additions & 3 deletions __tests__/happy.uploadAttachments.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ import waitForConnected from './setup/waitForConnected';

jest.setTimeout(10000);

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

beforeEach(() => unsubscribes = []);
Expand Down Expand Up @@ -55,11 +56,11 @@ describe('Happy path', () => {
// DirectLine.postActivityWithAttachments support "contentUrl" only but not "content"
attachments: [{
contentType: 'image/jpg',
contentUrl: 'https://dljstestbot.azurewebsites.net/177KB.jpg',
contentUrl: 'https://webchat-mockbot.azurewebsites.net/public/assets/surface1.jpg',
thumbnailUrl: 'data:image/png;base64,===177KB.jpg'
}, {
contentType: 'image/png',
contentUrl: 'https://dljstestbot.azurewebsites.net/100KB.jpg',
contentUrl: 'https://webchat-mockbot.azurewebsites.net/public/assets/surface2.jpg',
thumbnailUrl: 'data:image/png;base64,===100KB.jpb'
}],
text: 'Hello, World!',
Expand Down
3 changes: 2 additions & 1 deletion __tests__/unhappy.invalidLocaleOnStartConversation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import { timeouts } from './constants.json';
import * as createDirectLine from './setup/createDirectLine';
import waitForBotToRespond from './setup/waitForBotToRespond';

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

beforeEach(() => unsubscribes = []);
Expand Down
3 changes: 2 additions & 1 deletion __tests__/unhappy.postActivityFatalAfterConnect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ import postActivity from './setup/postActivity';
import waitForBotToEcho from './setup/waitForBotToEcho';
import waitForConnected from './setup/waitForConnected';

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

beforeEach(() => (unsubscribes = []));
Expand Down
16 changes: 8 additions & 8 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"license": "MIT",
"dependencies": {
"@babel/runtime": "7.14.8",
"botframework-streaming": "4.14.1",
"botframework-streaming": "4.19.3",
"buffer": "6.0.3",
"core-js": "3.15.2",
"cross-fetch": "^3.1.5",
Expand Down Expand Up @@ -66,7 +66,7 @@
"rimraf": "^3.0.2",
"simple-update-in": "^2.2.0",
"typescript": "^4.3.5",
"webpack": "^5.75.0",
"webpack": "^5.76.2",
"webpack-cli": "^4.7.2",
"webpack-stats-plugin": "^1.0.3"
}
Expand Down