diff options
| author | Chocobozzz <me@florianbigard.com> | 2018-09-20 16:24:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-20 16:24:31 +0200 |
| commit | 0491173a61aed66205c017e0d7e0503ea316c144 (patch) | |
| tree | ce6621597505f9518cfdf0981977d097c63f9fad /client/e2e/src/videos.e2e-spec.ts | |
| parent | 8704acf49efc770d73bf07c10468ed8c74d28a83 (diff) | |
| parent | 6247b2057b792cea155a1abd9788c363ae7d2cc2 (diff) | |
| download | PeerTube-0491173a61aed66205c017e0d7e0503ea316c144.tar.gz PeerTube-0491173a61aed66205c017e0d7e0503ea316c144.tar.zst PeerTube-0491173a61aed66205c017e0d7e0503ea316c144.zip | |
Merge branch 'develop' into cli-wrapper
Diffstat (limited to 'client/e2e/src/videos.e2e-spec.ts')
| -rw-r--r-- | client/e2e/src/videos.e2e-spec.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/e2e/src/videos.e2e-spec.ts b/client/e2e/src/videos.e2e-spec.ts index 3d4d46292..606b6ac5d 100644 --- a/client/e2e/src/videos.e2e-spec.ts +++ b/client/e2e/src/videos.e2e-spec.ts | |||
| @@ -12,7 +12,7 @@ describe('Videos workflow', () => { | |||
| 12 | let isSafari = false | 12 | let isSafari = false |
| 13 | 13 | ||
| 14 | beforeEach(async () => { | 14 | beforeEach(async () => { |
| 15 | browser.waitForAngularEnabled(false) | 15 | await browser.waitForAngularEnabled(false) |
| 16 | 16 | ||
| 17 | videoWatchPage = new VideoWatchPage() | 17 | videoWatchPage = new VideoWatchPage() |
| 18 | pageUploadPage = new VideoUploadPage() | 18 | pageUploadPage = new VideoUploadPage() |
| @@ -62,7 +62,7 @@ describe('Videos workflow', () => { | |||
| 62 | if (isMobileDevice || isSafari) videoNameToExcept = await videoWatchPage.clickOnFirstVideo() | 62 | if (isMobileDevice || isSafari) videoNameToExcept = await videoWatchPage.clickOnFirstVideo() |
| 63 | else await videoWatchPage.clickOnVideo(videoName) | 63 | else await videoWatchPage.clickOnVideo(videoName) |
| 64 | 64 | ||
| 65 | return videoWatchPage.waitWatchVideoName(videoNameToExcept, isSafari) | 65 | return videoWatchPage.waitWatchVideoName(videoNameToExcept, isMobileDevice, isSafari) |
| 66 | }) | 66 | }) |
| 67 | 67 | ||
| 68 | it('Should play the video', async () => { | 68 | it('Should play the video', async () => { |