aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-05-11 10:48:42 +0200
committerChocobozzz <me@florianbigard.com>2020-05-11 10:48:42 +0200
commit3a1a00a4af866caa96355c6702bbf805685d0973 (patch)
treefd4f98b80b13c8de7e1e6abc758e98241528b18c
parent3a7a261f3345c1ff2de4bed0949f84521ca54a96 (diff)
downloadPeerTube-3a1a00a4af866caa96355c6702bbf805685d0973.tar.gz
PeerTube-3a1a00a4af866caa96355c6702bbf805685d0973.tar.zst
PeerTube-3a1a00a4af866caa96355c6702bbf805685d0973.zip
Fix safari e2e tests
-rw-r--r--client/e2e/fixtures/video.mp4bin619477 -> 619477 bytes
-rw-r--r--client/e2e/protractor.conf.js12
-rw-r--r--client/e2e/src/po/video-watch.po.ts5
3 files changed, 9 insertions, 8 deletions
diff --git a/client/e2e/fixtures/video.mp4 b/client/e2e/fixtures/video.mp4
index c9ba8fd04..23000cfc1 100644
--- a/client/e2e/fixtures/video.mp4
+++ b/client/e2e/fixtures/video.mp4
Binary files differ
diff --git a/client/e2e/protractor.conf.js b/client/e2e/protractor.conf.js
index 5682de829..0dd1f6ee5 100644
--- a/client/e2e/protractor.conf.js
+++ b/client/e2e/protractor.conf.js
@@ -19,17 +19,17 @@ exports.config = {
19 19
20 multiCapabilities: [ 20 multiCapabilities: [
21 { 21 {
22 browserName: 'Chrome',
23 name: 'Latest Chrome Desktop',
24 resolution: '1280x1024'
25 },
26 {
27 browserName: 'Safari', 22 browserName: 'Safari',
28 version: '11.1', 23 version: '11.1',
29 name: 'Safari Desktop', 24 name: 'Safari Desktop',
30 resolution: '1280x1024' 25 resolution: '1280x1024'
31 }, 26 },
32 { 27 {
28 browserName: 'Chrome',
29 name: 'Latest Chrome Desktop',
30 resolution: '1280x1024'
31 },
32 {
33 browserName: 'Firefox', 33 browserName: 'Firefox',
34 version: '60', // ESR, 34 version: '60', // ESR,
35 name: 'Firefox ESR Desktop', 35 name: 'Firefox ESR Desktop',
@@ -61,7 +61,7 @@ exports.config = {
61 } 61 }
62 ], 62 ],
63 63
64 // maxSessions: 1, 64 maxSessions: 1,
65 // BrowserStack compatible ports: https://www.browserstack.com/question/664 65 // BrowserStack compatible ports: https://www.browserstack.com/question/664
66 baseUrl: 'http://localhost:3333/', 66 baseUrl: 'http://localhost:3333/',
67 framework: 'jasmine', 67 framework: 'jasmine',
diff --git a/client/e2e/src/po/video-watch.po.ts b/client/e2e/src/po/video-watch.po.ts
index 4a36fce62..c5e37e6de 100644
--- a/client/e2e/src/po/video-watch.po.ts
+++ b/client/e2e/src/po/video-watch.po.ts
@@ -84,12 +84,13 @@ export class VideoWatchPage {
84 } 84 }
85 85
86 async clickOnFirstVideo () { 86 async clickOnFirstVideo () {
87 const video = element.all(by.css('.videos .video-miniature .video-miniature-name')).first() 87 const video = element.all(by.css('.videos .video-miniature .video-thumbnail')).first()
88 const videoName = element.all(by.css('.videos .video-miniature .video-miniature-name')).first()
88 89
89 // Don't know why but the expectation fails on Safari 90 // Don't know why but the expectation fails on Safari
90 await browser.wait(browser.ExpectedConditions.elementToBeClickable(video)) 91 await browser.wait(browser.ExpectedConditions.elementToBeClickable(video))
91 92
92 const textToReturn = video.getText() 93 const textToReturn = videoName.getText()
93 await video.click() 94 await video.click()
94 95
95 await browser.wait(browser.ExpectedConditions.urlContains('/watch/')) 96 await browser.wait(browser.ExpectedConditions.urlContains('/watch/'))