Skip to content

Commit

Permalink
Merge branch 'master' into fix-readme-4.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
corinagum committed Nov 1, 2019
2 parents d856992 + f0bdc7c commit 93a02dc
Show file tree
Hide file tree
Showing 20 changed files with 2,827 additions and 1,801 deletions.
75 changes: 75 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,81 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

### Changed

- Bumped all dependencies to latest version, by [@compulim](https://github.com/compulim), in PR [#2533](https://github.com/microsoft/BotFramework-WebChat/pull/2533)
- Development dependencies
- Root package
- `@azure/storage-blob@12.0.0`
- `@babel/plugin-proposal-class-properties@7.5.5`
- `@babel/plugin-proposal-object-rest-spread@7.6.2`
- `@babel/plugin-transform-runtime@7.6.2`
- `@babel/preset-env@7.6.3`
- `@babel/preset-react@7.6.3`
- `@babel/preset-typescript@7.6.0`
- `@babel/runtime@7.6.3`
- `babel-jest@24.9.0`
- `core-js@3.3.6`
- `coveralls@3.0.7`
- `husky@3.0.9`
- `jest-image-snapshot@2.11.0`
- `jest@24.9.0`
- `lerna@3.18.3`
- `lint-staged@9.4.2`
- `selenium-webdriver@4.0.0-alpha.5`
- `serve-handler@6.1.2`
- Other packages
- `@babel/cli@7.6.4`
- `@babel/core@7.6.4`
- `@babel/plugin-proposal-class-properties@7.5.5`
- `@babel/plugin-proposal-object-rest-spread@7.6.2`
- `@babel/plugin-transform-runtime@7.6.2`
- `@babel/preset-env@7.6.3`
- `@babel/preset-react@7.6.3`
- `@babel/preset-typescript@7.6.0`
- `@types/node@12.12.3`
- `@types/react@16.9.11`
- `@typescript-eslint/eslint-plugin@2.6.0`
- `@typescript-eslint/parser@2.6.0`
- `babel-plugin-istanbul@5.2.0`
- `concurrently@5.0.0`
- `copy-webpack-plugin@5.0.4`
- `eslint-plugin-prettier@3.1.1`
- `eslint-plugin-react-hooks@2.2.0`
- `eslint-plugin-react@7.16.0`
- `eslint@6.6.0`
- `http-proxy-middleware@0.20.0`
- `jest@24.9.0`
- `terser-webpack-plugin@2.2.1`
- `typescript@3.6.4`
- `webpack-cli@3.3.10`
- `webpack@4.41.2`
- Production dependencies
- `core`
- `@babel/runtime@7.6.3`
- `jsonwebtoken@8.5.1`
- `math-random`
- `redux-saga@1.1.1`
- `simple-update-in@2.1.1`
- `bundle`
- `@babel/runtime@7.6.3`
- `core-js@3.3.6`
- `markdown-it@10.0.0`
- `memoize-one@5.1.1`
- `sanitize-html@1.19.0`
- `url-search-params-polyfill@7.0.0`
- `component`
- `bytes@3.1.0`
- `memoize-one@5.1.1`
- `react-redux@7.1.1`
- `remark@11.0.1`
- `sanitize-html@1.20.1`
- `simple-update-in@2.1.1`
- `strip-markdown@3.1.1`
- `embed`
- `@babel/runtime@7.6.3`
- `core-js@3.3.6`

## [4.6.0] - 2019-10-30

### Breaking changes
Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions __tests__/speech.recognition.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { timeouts } from './constants.json';

import minNumActivitiesShown from './setup/conditions/minNumActivitiesShown';
import negateCondition from './setup/conditions/negate';
import speechRecognitionStartCalled from './setup/conditions/speechRecognitionStartCalled';
Expand Down
14 changes: 13 additions & 1 deletion __tests__/video.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,25 @@ test('video', async () => {

await pageObjects.switchToYouTubeIFRAME();

// Play the video
await clickButton(driver, By.css('button[aria-label="Play"]'));

// Wait until the video complete buffered and start playing
await driver.sleep(5000);

// Pause the video
await clickButton(driver, By.css('button[aria-label="Pause (k)"]'));

// Rewind for 10 seconds
await driver
.actions()
.sendKeys('j')
.perform();

// Hide the spinner animation
await driver.executeScript(() => document.querySelector('.ytp-spinner').remove());

// Wait for YouTube play/pause button animation to complete
// Wait for YouTube play/pause/rewind animation to complete
await driver.sleep(1000);

const base64PNG = await driver.takeScreenshot();
Expand Down

0 comments on commit 93a02dc

Please sign in to comment.