From b528582df28f20ec7481d3c73d16b4291fe9c7e7 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 24 May 2018 14:33:58 +0200 Subject: [PATCH] Clean up E2E tests --- client/e2e/src/po/video-watch.po.ts | 9 ++------- client/e2e/src/videos.e2e-spec.ts | 4 ++-- 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 @@ -import { by, element, browser } from 'protractor' +import { browser, by, element } from 'protractor' export class VideoWatchPage { async goOnVideosList (isMobileDevice: boolean, isSafari: boolean) { @@ -41,18 +41,13 @@ export class VideoWatchPage { .then(seconds => parseInt(seconds, 10)) } - async pauseVideo (isAutoplay: boolean, isDesktopSafari: boolean) { + async pauseVideo (isAutoplay: boolean) { if (isAutoplay === false) { const playButton = element(by.css('.vjs-big-play-button')) await browser.wait(browser.ExpectedConditions.elementToBeClickable(playButton)) await playButton.click() } - // if (isDesktopSafari === true) { - // await browser.sleep(1000) - // await element(by.css('.vjs-play-control')).click() - // } - await browser.sleep(1000) await browser.wait(browser.ExpectedConditions.invisibilityOf(element(by.css('.vjs-loading-spinner')))) 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', () => { }) it('Should play the video', async () => { - await videoWatchPage.pauseVideo(!isMobileDevice, isSafari && isMobileDevice === false) + await videoWatchPage.pauseVideo(!isMobileDevice) expect(videoWatchPage.getWatchVideoPlayerCurrentTime()).toBeGreaterThanOrEqual(2) }) it('Should watch the associated embed video', async () => { await videoWatchPage.goOnAssociatedEmbed() - await videoWatchPage.pauseVideo(false, isSafari && isMobileDevice === false) + await videoWatchPage.pauseVideo(false) expect(videoWatchPage.getWatchVideoPlayerCurrentTime()).toBeGreaterThanOrEqual(2) }) }) -- 2.25.1