aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/e2e/src/videos.e2e-spec.ts
diff options
context:
space:
mode:
Diffstat (limited to 'client/e2e/src/videos.e2e-spec.ts')
-rw-r--r--client/e2e/src/videos.e2e-spec.ts17
1 files changed, 11 insertions, 6 deletions
diff --git a/client/e2e/src/videos.e2e-spec.ts b/client/e2e/src/videos.e2e-spec.ts
index d8af1885f..d9d2cb9b9 100644
--- a/client/e2e/src/videos.e2e-spec.ts
+++ b/client/e2e/src/videos.e2e-spec.ts
@@ -43,7 +43,7 @@ describe('Videos workflow', () => {
43 if (await isIOS()) { 43 if (await isIOS()) {
44 // iOS does not seem to work with protractor 44 // iOS does not seem to work with protractor
45 // https://github.com/angular/protractor/issues/2840 45 // https://github.com/angular/protractor/issues/2840
46 browser.ignoreSynchronization = true 46 browser.waitForAngularEnabled(false)
47 47
48 console.log('iOS detected') 48 console.log('iOS detected')
49 } else if (await isMobileDevice()) { 49 } else if (await isMobileDevice()) {
@@ -111,6 +111,7 @@ describe('Videos workflow', () => {
111 }) 111 })
112 112
113 it('Should watch the associated embed video', async () => { 113 it('Should watch the associated embed video', async () => {
114 const oldValue = await browser.waitForAngularEnabled()
114 await browser.waitForAngularEnabled(false) 115 await browser.waitForAngularEnabled(false)
115 116
116 await videoWatchPage.goOnAssociatedEmbed() 117 await videoWatchPage.goOnAssociatedEmbed()
@@ -118,10 +119,11 @@ describe('Videos workflow', () => {
118 await playerPage.playAndPauseVideo(false) 119 await playerPage.playAndPauseVideo(false)
119 expect(playerPage.getWatchVideoPlayerCurrentTime()).toBeGreaterThanOrEqual(2) 120 expect(playerPage.getWatchVideoPlayerCurrentTime()).toBeGreaterThanOrEqual(2)
120 121
121 await browser.waitForAngularEnabled(true) 122 await browser.waitForAngularEnabled(oldValue)
122 }) 123 })
123 124
124 it('Should watch the p2p media loader embed video', async () => { 125 it('Should watch the p2p media loader embed video', async () => {
126 const oldValue = await browser.waitForAngularEnabled()
125 await browser.waitForAngularEnabled(false) 127 await browser.waitForAngularEnabled(false)
126 128
127 await videoWatchPage.goOnP2PMediaLoaderEmbed() 129 await videoWatchPage.goOnP2PMediaLoaderEmbed()
@@ -129,7 +131,7 @@ describe('Videos workflow', () => {
129 await playerPage.playAndPauseVideo(false) 131 await playerPage.playAndPauseVideo(false)
130 expect(playerPage.getWatchVideoPlayerCurrentTime()).toBeGreaterThanOrEqual(2) 132 expect(playerPage.getWatchVideoPlayerCurrentTime()).toBeGreaterThanOrEqual(2)
131 133
132 await browser.waitForAngularEnabled(true) 134 await browser.waitForAngularEnabled(oldValue)
133 }) 135 })
134 136
135 it('Should update the video', async () => { 137 it('Should update the video', async () => {
@@ -185,11 +187,12 @@ describe('Videos workflow', () => {
185 187
186 await myAccountPage.playPlaylist() 188 await myAccountPage.playPlaylist()
187 189
190 const oldValue = await browser.waitForAngularEnabled()
188 await browser.waitForAngularEnabled(false) 191 await browser.waitForAngularEnabled(false)
189 192
190 await videoWatchPage.waitUntilVideoName(video2Name, 20000 * 1000) 193 await videoWatchPage.waitUntilVideoName(video2Name, 20000 * 1000)
191 194
192 await browser.waitForAngularEnabled(true) 195 await browser.waitForAngularEnabled(oldValue)
193 }) 196 })
194 197
195 it('Should watch the webtorrent playlist in the embed', async () => { 198 it('Should watch the webtorrent playlist in the embed', async () => {
@@ -198,6 +201,7 @@ describe('Videos workflow', () => {
198 const accessToken = await browser.executeScript(`return window.localStorage.getItem('access_token');`) 201 const accessToken = await browser.executeScript(`return window.localStorage.getItem('access_token');`)
199 const refreshToken = await browser.executeScript(`return window.localStorage.getItem('refresh_token');`) 202 const refreshToken = await browser.executeScript(`return window.localStorage.getItem('refresh_token');`)
200 203
204 const oldValue = await browser.waitForAngularEnabled()
201 await browser.waitForAngularEnabled(false) 205 await browser.waitForAngularEnabled(false)
202 206
203 await myAccountPage.goOnAssociatedPlaylistEmbed() 207 await myAccountPage.goOnAssociatedPlaylistEmbed()
@@ -212,10 +216,11 @@ describe('Videos workflow', () => {
212 216
213 await playerPage.waitUntilPlaylistInfo('2/2') 217 await playerPage.waitUntilPlaylistInfo('2/2')
214 218
215 await browser.waitForAngularEnabled(true) 219 await browser.waitForAngularEnabled(oldValue)
216 }) 220 })
217 221
218 it('Should watch the HLS playlist in the embed', async () => { 222 it('Should watch the HLS playlist in the embed', async () => {
223 const oldValue = await browser.waitForAngularEnabled()
219 await browser.waitForAngularEnabled(false) 224 await browser.waitForAngularEnabled(false)
220 225
221 await videoWatchPage.goOnP2PMediaLoaderPlaylistEmbed() 226 await videoWatchPage.goOnP2PMediaLoaderPlaylistEmbed()
@@ -224,7 +229,7 @@ describe('Videos workflow', () => {
224 229
225 await playerPage.waitUntilPlaylistInfo('2/2') 230 await playerPage.waitUntilPlaylistInfo('2/2')
226 231
227 await browser.waitForAngularEnabled(true) 232 await browser.waitForAngularEnabled(oldValue)
228 }) 233 })
229 234
230 it('Should delete the video 2', async () => { 235 it('Should delete the video 2', async () => {