aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/e2e
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2023-07-11 09:21:13 +0200
committerChocobozzz <me@florianbigard.com>2023-07-11 09:21:13 +0200
commit784e2ad5c34bcfef36a3f69e9e9acd7cbb3d6428 (patch)
tree29c46cfd6344065eb805680ed080cb05592ee1d4 /client/e2e
parentc3030e944ad03c7fd7b5d668a2d88ff03e4cdf19 (diff)
downloadPeerTube-784e2ad5c34bcfef36a3f69e9e9acd7cbb3d6428.tar.gz
PeerTube-784e2ad5c34bcfef36a3f69e9e9acd7cbb3d6428.tar.zst
PeerTube-784e2ad5c34bcfef36a3f69e9e9acd7cbb3d6428.zip
Prefer web videos in favour of webtorrent
Diffstat (limited to 'client/e2e')
-rw-r--r--client/e2e/src/suites-all/private-videos.e2e-spec.ts8
-rw-r--r--client/e2e/src/suites-all/videos.e2e-spec.ts4
-rw-r--r--client/e2e/src/utils/urls.ts6
-rw-r--r--client/e2e/wdio.local-test.conf.ts18
4 files changed, 18 insertions, 18 deletions
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', () => {
31 return loginPage.loginOnPeerTube2() 31 return loginPage.loginOnPeerTube2()
32 }) 32 })
33 33
34 it('Should play an internal webtorrent video', async () => { 34 it('Should play an internal web video video', async () => {
35 await go(FIXTURE_URLS.INTERNAL_WEBTORRENT_VIDEO) 35 await go(FIXTURE_URLS.INTERNAL_WEB_VIDEO)
36 36
37 await videoWatchPage.waitWatchVideoName(internalVideoName) 37 await videoWatchPage.waitWatchVideoName(internalVideoName)
38 await checkCorrectlyPlay(playerPage) 38 await checkCorrectlyPlay(playerPage)
@@ -52,8 +52,8 @@ describe('Private videos all workflow', () => {
52 await checkCorrectlyPlay(playerPage) 52 await checkCorrectlyPlay(playerPage)
53 }) 53 })
54 54
55 it('Should play an internal WebTorrent video in embed', async () => { 55 it('Should play an internal Web Video in embed', async () => {
56 await go(FIXTURE_URLS.INTERNAL_EMBED_WEBTORRENT_VIDEO) 56 await go(FIXTURE_URLS.INTERNAL_EMBED_WEB_VIDEO)
57 57
58 await videoWatchPage.waitEmbedForDisplayed() 58 await videoWatchPage.waitEmbedForDisplayed()
59 await checkCorrectlyPlay(playerPage) 59 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', () => {
89 let videoNameToExcept = videoName 89 let videoNameToExcept = videoName
90 90
91 if (isMobileDevice() || isSafari()) { 91 if (isMobileDevice() || isSafari()) {
92 await go(FIXTURE_URLS.WEBTORRENT_VIDEO) 92 await go(FIXTURE_URLS.WEB_VIDEO)
93 videoNameToExcept = 'E2E tests' 93 videoNameToExcept = 'E2E tests'
94 } else { 94 } else {
95 await videoListPage.clickOnVideo(videoName) 95 await videoListPage.clickOnVideo(videoName)
@@ -176,7 +176,7 @@ describe('Videos all workflow', () => {
176 await videoWatchPage.waitUntilVideoName(video2Name, 40 * 1000) 176 await videoWatchPage.waitUntilVideoName(video2Name, 40 * 1000)
177 }) 177 })
178 178
179 it('Should watch the webtorrent playlist in the embed', async () => { 179 it('Should watch the WEB VIDEO playlist in the embed', async () => {
180 if (isUploadUnsupported()) return 180 if (isUploadUnsupported()) return
181 181
182 const accessToken = await browser.execute(`return window.localStorage.getItem('access_token');`) 182 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 @@
1const FIXTURE_URLS = { 1const FIXTURE_URLS = {
2 INTERNAL_WEBTORRENT_VIDEO: 'https://peertube2.cpy.re/w/pwfz7NizSdPD4mJcbbmNwa?mode=webtorrent&start=0', 2 INTERNAL_WEB_VIDEO: 'https://peertube2.cpy.re/w/pwfz7NizSdPD4mJcbbmNwa?mode=web-video&start=0',
3 INTERNAL_HLS_VIDEO: 'https://peertube2.cpy.re/w/pwfz7NizSdPD4mJcbbmNwa?start=0', 3 INTERNAL_HLS_VIDEO: 'https://peertube2.cpy.re/w/pwfz7NizSdPD4mJcbbmNwa?start=0',
4 4
5 INTERNAL_EMBED_WEBTORRENT_VIDEO: 'https://peertube2.cpy.re/videos/embed/pwfz7NizSdPD4mJcbbmNwa?mode=webtorrent&start=0', 5 INTERNAL_EMBED_WEB_VIDEO: 'https://peertube2.cpy.re/videos/embed/pwfz7NizSdPD4mJcbbmNwa?mode=web-video&start=0',
6 INTERNAL_EMBED_HLS_VIDEO: 'https://peertube2.cpy.re/videos/embed/pwfz7NizSdPD4mJcbbmNwa?start=0', 6 INTERNAL_EMBED_HLS_VIDEO: 'https://peertube2.cpy.re/videos/embed/pwfz7NizSdPD4mJcbbmNwa?start=0',
7 7
8 INTERNAL_HLS_ONLY_VIDEO: 'https://peertube2.cpy.re/w/tKQmHcqdYZRdCszLUiWM3V?start=0', 8 INTERNAL_HLS_ONLY_VIDEO: 'https://peertube2.cpy.re/w/tKQmHcqdYZRdCszLUiWM3V?start=0',
9 INTERNAL_EMBED_HLS_ONLY_VIDEO: 'https://peertube2.cpy.re/videos/embed/tKQmHcqdYZRdCszLUiWM3V?start=0', 9 INTERNAL_EMBED_HLS_ONLY_VIDEO: 'https://peertube2.cpy.re/videos/embed/tKQmHcqdYZRdCszLUiWM3V?start=0',
10 10
11 WEBTORRENT_VIDEO: 'https://peertube2.cpy.re/w/122d093a-1ede-43bd-bd34-59d2931ffc5e', 11 WEB_VIDEO: 'https://peertube2.cpy.re/w/122d093a-1ede-43bd-bd34-59d2931ffc5e',
12 12
13 HLS_EMBED: 'https://peertube2.cpy.re/videos/embed/969bf103-7818-43b5-94a0-de159e13de50', 13 HLS_EMBED: 'https://peertube2.cpy.re/videos/embed/969bf103-7818-43b5-94a0-de159e13de50',
14 HLS_PLAYLIST_EMBED: 'https://peertube2.cpy.re/video-playlists/embed/73804a40-da9a-40c2-b1eb-2c6d9eec8f0a', 14 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 = {
24 specFileRetries: 0, 24 specFileRetries: 0,
25 25
26 capabilities: [ 26 capabilities: [
27 { 27 // {
28 'browserName': 'chrome', 28 // 'browserName': 'chrome',
29 'acceptInsecureCerts': true, 29 // 'acceptInsecureCerts': true,
30 'goog:chromeOptions': { 30 // 'goog:chromeOptions': {
31 args: [ '--disable-gpu', windowSizeArg ], 31 // args: [ '--disable-gpu', windowSizeArg ],
32 prefs 32 // prefs
33 } 33 // }
34 }, 34 // },
35 { 35 {
36 'browserName': 'firefox', 36 'browserName': 'firefox',
37 'moz:firefoxOptions': { 37 'moz:firefoxOptions': {
38 binary: '/usr/bin/firefox-developer-edition', 38 binary: '/usr/bin/firefox-developer-edition',
39 args: [ '--headless', windowSizeArg ], 39 // args: [ '--headless', windowSizeArg ],
40 40
41 prefs 41 prefs
42 } 42 }