diff options
author | Chocobozzz <me@florianbigard.com> | 2018-05-18 11:02:40 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-05-22 09:17:20 +0200 |
commit | cd4d7a2ca868209fb1e2dbd790c1e5d6cca77e86 (patch) | |
tree | a8d9e219c893551f669a3de37ae0ee91a6c0f7cd /client/e2e/src | |
parent | b4e5942ca79b8f5702c80197ec40eab8fa053a24 (diff) | |
download | PeerTube-cd4d7a2ca868209fb1e2dbd790c1e5d6cca77e86.tar.gz PeerTube-cd4d7a2ca868209fb1e2dbd790c1e5d6cca77e86.tar.zst PeerTube-cd4d7a2ca868209fb1e2dbd790c1e5d6cca77e86.zip |
Fix peertube with google bot
Diffstat (limited to 'client/e2e/src')
-rw-r--r-- | client/e2e/src/po/login.po.ts | 4 | ||||
-rw-r--r-- | client/e2e/src/po/video-watch.po.ts | 12 | ||||
-rw-r--r-- | client/e2e/src/videos.e2e-spec.ts | 6 |
3 files changed, 12 insertions, 10 deletions
diff --git a/client/e2e/src/po/login.po.ts b/client/e2e/src/po/login.po.ts index ada52cb24..5a36fd611 100644 --- a/client/e2e/src/po/login.po.ts +++ b/client/e2e/src/po/login.po.ts | |||
@@ -4,8 +4,8 @@ export class LoginPage { | |||
4 | async loginAsRootUser () { | 4 | async loginAsRootUser () { |
5 | await browser.get('/login') | 5 | await browser.get('/login') |
6 | 6 | ||
7 | element(by.css('input#username')).sendKeys('root') | 7 | await element(by.css('input#username')).sendKeys('root') |
8 | element(by.css('input#password')).sendKeys('test1') | 8 | await element(by.css('input#password')).sendKeys('test1') |
9 | 9 | ||
10 | await element(by.css('form input[type=submit]')).click() | 10 | await element(by.css('form input[type=submit]')).click() |
11 | 11 | ||
diff --git a/client/e2e/src/po/video-watch.po.ts b/client/e2e/src/po/video-watch.po.ts index 266c9850c..b5df1cbc5 100644 --- a/client/e2e/src/po/video-watch.po.ts +++ b/client/e2e/src/po/video-watch.po.ts | |||
@@ -24,15 +24,19 @@ export class VideoWatchPage { | |||
24 | .then(seconds => parseInt(seconds, 10)) | 24 | .then(seconds => parseInt(seconds, 10)) |
25 | } | 25 | } |
26 | 26 | ||
27 | async pauseVideo () { | 27 | async pauseVideo (pauseAfterMs: number) { |
28 | const el = element(by.css('video')) | 28 | await browser.wait(browser.ExpectedConditions.invisibilityOf(element(by.css('.vjs-loading-spinner')))) |
29 | |||
30 | const el = element(by.css('div.video-js')) | ||
29 | await browser.wait(browser.ExpectedConditions.elementToBeClickable(el)) | 31 | await browser.wait(browser.ExpectedConditions.elementToBeClickable(el)) |
30 | 32 | ||
33 | await browser.sleep(pauseAfterMs) | ||
34 | |||
31 | return el.click() | 35 | return el.click() |
32 | } | 36 | } |
33 | 37 | ||
34 | async clickOnFirstVideoOfList () { | 38 | async clickOnVideo (videoName: string) { |
35 | const video = element(by.css('.videos .video-miniature:first-child .video-thumbnail')) | 39 | const video = element(by.css('.videos .video-miniature .video-thumbnail[title="' + videoName + '"]')) |
36 | 40 | ||
37 | await video.click() | 41 | await video.click() |
38 | 42 | ||
diff --git a/client/e2e/src/videos.e2e-spec.ts b/client/e2e/src/videos.e2e-spec.ts index 4205fd7a4..82cea72b1 100644 --- a/client/e2e/src/videos.e2e-spec.ts +++ b/client/e2e/src/videos.e2e-spec.ts | |||
@@ -34,15 +34,13 @@ describe('Videos workflow', () => { | |||
34 | }) | 34 | }) |
35 | 35 | ||
36 | it('Should go on video watch page', async () => { | 36 | it('Should go on video watch page', async () => { |
37 | await videoWatchPage.clickOnFirstVideoOfList() | 37 | await videoWatchPage.clickOnVideo(videoName) |
38 | 38 | ||
39 | return videoWatchPage.waitWatchVideoName(videoName) | 39 | return videoWatchPage.waitWatchVideoName(videoName) |
40 | }) | 40 | }) |
41 | 41 | ||
42 | it('Should play the video', async () => { | 42 | it('Should play the video', async () => { |
43 | await browser.sleep(4000) | 43 | await videoWatchPage.pauseVideo(2500) |
44 | |||
45 | await videoWatchPage.pauseVideo() | ||
46 | expect(videoWatchPage.getWatchVideoPlayerCurrentTime()).toBeGreaterThanOrEqual(2) | 44 | expect(videoWatchPage.getWatchVideoPlayerCurrentTime()).toBeGreaterThanOrEqual(2) |
47 | }) | 45 | }) |
48 | }) | 46 | }) |