From 784e2ad5c34bcfef36a3f69e9e9acd7cbb3d6428 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 11 Jul 2023 09:21:13 +0200 Subject: Prefer web videos in favour of webtorrent --- client/e2e/src/suites-all/private-videos.e2e-spec.ts | 8 ++++---- client/e2e/src/suites-all/videos.e2e-spec.ts | 4 ++-- client/e2e/src/utils/urls.ts | 6 +++--- client/e2e/wdio.local-test.conf.ts | 18 +++++++++--------- 4 files changed, 18 insertions(+), 18 deletions(-) (limited to 'client/e2e') diff --git a/client/e2e/src/suites-all/private-videos.e2e-spec.ts b/client/e2e/src/suites-all/private-videos.e2e-spec.ts index a25208bb3..829d76a84 100644 --- a/client/e2e/src/suites-all/private-videos.e2e-spec.ts +++ b/client/e2e/src/suites-all/private-videos.e2e-spec.ts @@ -31,8 +31,8 @@ describe('Private videos all workflow', () => { return loginPage.loginOnPeerTube2() }) - it('Should play an internal webtorrent video', async () => { - await go(FIXTURE_URLS.INTERNAL_WEBTORRENT_VIDEO) + it('Should play an internal web video video', async () => { + await go(FIXTURE_URLS.INTERNAL_WEB_VIDEO) await videoWatchPage.waitWatchVideoName(internalVideoName) await checkCorrectlyPlay(playerPage) @@ -52,8 +52,8 @@ describe('Private videos all workflow', () => { await checkCorrectlyPlay(playerPage) }) - it('Should play an internal WebTorrent video in embed', async () => { - await go(FIXTURE_URLS.INTERNAL_EMBED_WEBTORRENT_VIDEO) + it('Should play an internal Web Video in embed', async () => { + await go(FIXTURE_URLS.INTERNAL_EMBED_WEB_VIDEO) await videoWatchPage.waitEmbedForDisplayed() await checkCorrectlyPlay(playerPage) diff --git a/client/e2e/src/suites-all/videos.e2e-spec.ts b/client/e2e/src/suites-all/videos.e2e-spec.ts index d1ab9aef3..5d0f8c152 100644 --- a/client/e2e/src/suites-all/videos.e2e-spec.ts +++ b/client/e2e/src/suites-all/videos.e2e-spec.ts @@ -89,7 +89,7 @@ describe('Videos all workflow', () => { let videoNameToExcept = videoName if (isMobileDevice() || isSafari()) { - await go(FIXTURE_URLS.WEBTORRENT_VIDEO) + await go(FIXTURE_URLS.WEB_VIDEO) videoNameToExcept = 'E2E tests' } else { await videoListPage.clickOnVideo(videoName) @@ -176,7 +176,7 @@ describe('Videos all workflow', () => { await videoWatchPage.waitUntilVideoName(video2Name, 40 * 1000) }) - it('Should watch the webtorrent playlist in the embed', async () => { + it('Should watch the WEB VIDEO playlist in the embed', async () => { if (isUploadUnsupported()) return const accessToken = await browser.execute(`return window.localStorage.getItem('access_token');`) diff --git a/client/e2e/src/utils/urls.ts b/client/e2e/src/utils/urls.ts index cc0bdfbff..eafe0aa5d 100644 --- a/client/e2e/src/utils/urls.ts +++ b/client/e2e/src/utils/urls.ts @@ -1,14 +1,14 @@ const FIXTURE_URLS = { - INTERNAL_WEBTORRENT_VIDEO: 'https://peertube2.cpy.re/w/pwfz7NizSdPD4mJcbbmNwa?mode=webtorrent&start=0', + INTERNAL_WEB_VIDEO: 'https://peertube2.cpy.re/w/pwfz7NizSdPD4mJcbbmNwa?mode=web-video&start=0', INTERNAL_HLS_VIDEO: 'https://peertube2.cpy.re/w/pwfz7NizSdPD4mJcbbmNwa?start=0', - INTERNAL_EMBED_WEBTORRENT_VIDEO: 'https://peertube2.cpy.re/videos/embed/pwfz7NizSdPD4mJcbbmNwa?mode=webtorrent&start=0', + INTERNAL_EMBED_WEB_VIDEO: 'https://peertube2.cpy.re/videos/embed/pwfz7NizSdPD4mJcbbmNwa?mode=web-video&start=0', INTERNAL_EMBED_HLS_VIDEO: 'https://peertube2.cpy.re/videos/embed/pwfz7NizSdPD4mJcbbmNwa?start=0', INTERNAL_HLS_ONLY_VIDEO: 'https://peertube2.cpy.re/w/tKQmHcqdYZRdCszLUiWM3V?start=0', INTERNAL_EMBED_HLS_ONLY_VIDEO: 'https://peertube2.cpy.re/videos/embed/tKQmHcqdYZRdCszLUiWM3V?start=0', - WEBTORRENT_VIDEO: 'https://peertube2.cpy.re/w/122d093a-1ede-43bd-bd34-59d2931ffc5e', + WEB_VIDEO: 'https://peertube2.cpy.re/w/122d093a-1ede-43bd-bd34-59d2931ffc5e', HLS_EMBED: 'https://peertube2.cpy.re/videos/embed/969bf103-7818-43b5-94a0-de159e13de50', HLS_PLAYLIST_EMBED: 'https://peertube2.cpy.re/video-playlists/embed/73804a40-da9a-40c2-b1eb-2c6d9eec8f0a', diff --git a/client/e2e/wdio.local-test.conf.ts b/client/e2e/wdio.local-test.conf.ts index 96ddc67ca..6c0171372 100644 --- a/client/e2e/wdio.local-test.conf.ts +++ b/client/e2e/wdio.local-test.conf.ts @@ -24,19 +24,19 @@ module.exports = { specFileRetries: 0, capabilities: [ - { - 'browserName': 'chrome', - 'acceptInsecureCerts': true, - 'goog:chromeOptions': { - args: [ '--disable-gpu', windowSizeArg ], - prefs - } - }, + // { + // 'browserName': 'chrome', + // 'acceptInsecureCerts': true, + // 'goog:chromeOptions': { + // args: [ '--disable-gpu', windowSizeArg ], + // prefs + // } + // }, { 'browserName': 'firefox', 'moz:firefoxOptions': { binary: '/usr/bin/firefox-developer-edition', - args: [ '--headless', windowSizeArg ], + // args: [ '--headless', windowSizeArg ], prefs } -- cgit v1.2.3