diff options
Diffstat (limited to 'client')
-rw-r--r-- | client/e2e/local-protractor.conf.js | 2 | ||||
-rw-r--r-- | client/e2e/src/po/app.po.ts | 2 | ||||
-rw-r--r-- | client/e2e/src/po/player.po.ts | 9 | ||||
-rw-r--r-- | client/e2e/src/videos.e2e-spec.ts | 1 |
4 files changed, 8 insertions, 6 deletions
diff --git a/client/e2e/local-protractor.conf.js b/client/e2e/local-protractor.conf.js index 6120dab8c..5080f2528 100644 --- a/client/e2e/local-protractor.conf.js +++ b/client/e2e/local-protractor.conf.js | |||
@@ -38,7 +38,7 @@ exports.config = { | |||
38 | } | 38 | } |
39 | ], | 39 | ], |
40 | 40 | ||
41 | // maxSessions: 1, | 41 | maxSessions: 1, |
42 | baseUrl: 'http://localhost:3000/', | 42 | baseUrl: 'http://localhost:3000/', |
43 | framework: 'jasmine', | 43 | framework: 'jasmine', |
44 | jasmineNodeOpts: { | 44 | jasmineNodeOpts: { |
diff --git a/client/e2e/src/po/app.po.ts b/client/e2e/src/po/app.po.ts index 4954880ef..3ed65399e 100644 --- a/client/e2e/src/po/app.po.ts +++ b/client/e2e/src/po/app.po.ts | |||
@@ -9,6 +9,8 @@ export class AppPage { | |||
9 | 9 | ||
10 | await element(by.css('.configure-instance-button')).click() | 10 | await element(by.css('.configure-instance-button')).click() |
11 | 11 | ||
12 | await browser.sleep(5000) | ||
13 | |||
12 | await browser.switchTo().window(firstHandle) | 14 | await browser.switchTo().window(firstHandle) |
13 | } | 15 | } |
14 | } | 16 | } |
diff --git a/client/e2e/src/po/player.po.ts b/client/e2e/src/po/player.po.ts index 48e61dfea..cb148a003 100644 --- a/client/e2e/src/po/player.po.ts +++ b/client/e2e/src/po/player.po.ts | |||
@@ -3,11 +3,10 @@ import { browserSleep, isIOS, isMobileDevice, isSafari } from '../utils' | |||
3 | 3 | ||
4 | export class PlayerPage { | 4 | export class PlayerPage { |
5 | 5 | ||
6 | getWatchVideoPlayerCurrentTime () { | 6 | async getWatchVideoPlayerCurrentTime () { |
7 | return element(by.css('.video-js .vjs-current-time-display')) | 7 | const elem = element(by.css('video')) |
8 | .getText() | 8 | |
9 | .then((t: string) => t.split(':')[1]) | 9 | return elem.getAttribute('currentTime') |
10 | .then(seconds => parseInt(seconds, 10)) | ||
11 | } | 10 | } |
12 | 11 | ||
13 | waitUntilPlaylistInfo (text: string) { | 12 | waitUntilPlaylistInfo (text: string) { |
diff --git a/client/e2e/src/videos.e2e-spec.ts b/client/e2e/src/videos.e2e-spec.ts index 4fccdf1b6..cb7926258 100644 --- a/client/e2e/src/videos.e2e-spec.ts +++ b/client/e2e/src/videos.e2e-spec.ts | |||
@@ -158,6 +158,7 @@ describe('Videos workflow', () => { | |||
158 | await videoWatchPage.createPlaylist(playlistName) | 158 | await videoWatchPage.createPlaylist(playlistName) |
159 | 159 | ||
160 | await videoWatchPage.saveToPlaylist(playlistName) | 160 | await videoWatchPage.saveToPlaylist(playlistName) |
161 | await browser.sleep(5000) | ||
161 | 162 | ||
162 | await videoUploadPage.navigateTo() | 163 | await videoUploadPage.navigateTo() |
163 | 164 | ||