Skip to content

Commit

Permalink
Merge pull request #1152 from Microsoft/corinagum/1132-tests
Browse files Browse the repository at this point in the history
Bump Web Chat
  • Loading branch information
Justin Wilaby committed Dec 7, 2018
2 parents 9c0d5bc + 796d8ae commit d167bbe
Show file tree
Hide file tree
Showing 9 changed files with 335 additions and 178 deletions.
61 changes: 40 additions & 21 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion packages/app/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
"@uifabric/styling": "^5.20.0",
"base64url": "2.0.0",
"botframework-config": "4.0.0-preview1.3.4",
"botframework-webchat": "0.14.3-master.b0553fd",
"botframework-webchat": "0.15.1-v3.4da20d6",
"react": "~16.3.2",
"react-dom": "~16.3.2",
"react-redux": "^5.0.7",
Expand Down
2 changes: 1 addition & 1 deletion packages/app/client/src/ui/shell/mdi/tabBar/tabBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ export class TabBar extends React.Component<TabBarProps, TabBarState> {

private get tabs(): JSX.Element[] {
return this.props.tabOrder.map((documentId, index) => {
const document = this.props.documents[documentId];
const document = this.props.documents[documentId] || {};
const isActive = documentId === this.props.activeDocumentId;

return (
Expand Down
33 changes: 33 additions & 0 deletions packages/app/main/src/commands/emulatorCommands.spec.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,36 @@
//
// Copyright (c) Microsoft. All rights reserved.
// Licensed under the MIT license.
//
// Microsoft Bot Framework: http://botframework.com
//
// Bot Framework Emulator Github:
// https://github.com/Microsoft/BotFramwork-Emulator
//
// Copyright (c) Microsoft Corporation
// All rights reserved.
//
// MIT License:
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED ""AS IS"", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//

import '../fetchProxy';
import { combineReducers, createStore } from 'redux';
import * as BotActions from '../botData/actions/botActions';
Expand Down

This file was deleted.

0 comments on commit d167bbe

Please sign in to comment.