aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/e2e/src
diff options
context:
space:
mode:
Diffstat (limited to 'client/e2e/src')
-rw-r--r--client/e2e/src/po/video-watch.po.ts9
-rw-r--r--client/e2e/src/videos.e2e-spec.ts4
2 files changed, 4 insertions, 9 deletions
diff --git a/client/e2e/src/po/video-watch.po.ts b/client/e2e/src/po/video-watch.po.ts
index ec3d16c3b..5bb7e5694 100644
--- a/client/e2e/src/po/video-watch.po.ts
+++ b/client/e2e/src/po/video-watch.po.ts
@@ -1,4 +1,4 @@
1import { by, element, browser } from 'protractor' 1import { browser, by, element } from 'protractor'
2 2
3export class VideoWatchPage { 3export class VideoWatchPage {
4 async goOnVideosList (isMobileDevice: boolean, isSafari: boolean) { 4 async goOnVideosList (isMobileDevice: boolean, isSafari: boolean) {
@@ -41,18 +41,13 @@ export class VideoWatchPage {
41 .then(seconds => parseInt(seconds, 10)) 41 .then(seconds => parseInt(seconds, 10))
42 } 42 }
43 43
44 async pauseVideo (isAutoplay: boolean, isDesktopSafari: boolean) { 44 async pauseVideo (isAutoplay: boolean) {
45 if (isAutoplay === false) { 45 if (isAutoplay === false) {
46 const playButton = element(by.css('.vjs-big-play-button')) 46 const playButton = element(by.css('.vjs-big-play-button'))
47 await browser.wait(browser.ExpectedConditions.elementToBeClickable(playButton)) 47 await browser.wait(browser.ExpectedConditions.elementToBeClickable(playButton))
48 await playButton.click() 48 await playButton.click()
49 } 49 }
50 50
51 // if (isDesktopSafari === true) {
52 // await browser.sleep(1000)
53 // await element(by.css('.vjs-play-control')).click()
54 // }
55
56 await browser.sleep(1000) 51 await browser.sleep(1000)
57 await browser.wait(browser.ExpectedConditions.invisibilityOf(element(by.css('.vjs-loading-spinner')))) 52 await browser.wait(browser.ExpectedConditions.invisibilityOf(element(by.css('.vjs-loading-spinner'))))
58 53
diff --git a/client/e2e/src/videos.e2e-spec.ts b/client/e2e/src/videos.e2e-spec.ts
index 16fe6b70d..b15c03198 100644
--- a/client/e2e/src/videos.e2e-spec.ts
+++ b/client/e2e/src/videos.e2e-spec.ts
@@ -66,14 +66,14 @@ describe('Videos workflow', () => {
66 }) 66 })
67 67
68 it('Should play the video', async () => { 68 it('Should play the video', async () => {
69 await videoWatchPage.pauseVideo(!isMobileDevice, isSafari && isMobileDevice === false) 69 await videoWatchPage.pauseVideo(!isMobileDevice)
70 expect(videoWatchPage.getWatchVideoPlayerCurrentTime()).toBeGreaterThanOrEqual(2) 70 expect(videoWatchPage.getWatchVideoPlayerCurrentTime()).toBeGreaterThanOrEqual(2)
71 }) 71 })
72 72
73 it('Should watch the associated embed video', async () => { 73 it('Should watch the associated embed video', async () => {
74 await videoWatchPage.goOnAssociatedEmbed() 74 await videoWatchPage.goOnAssociatedEmbed()
75 75
76 await videoWatchPage.pauseVideo(false, isSafari && isMobileDevice === false) 76 await videoWatchPage.pauseVideo(false)
77 expect(videoWatchPage.getWatchVideoPlayerCurrentTime()).toBeGreaterThanOrEqual(2) 77 expect(videoWatchPage.getWatchVideoPlayerCurrentTime()).toBeGreaterThanOrEqual(2)
78 }) 78 })
79}) 79})