forks
/
peertube
1
0
Fork 0
Code Releases Activity

Fix safari e2e tests

This commit is contained in:
Chocobozzz 2020-05-11 10:48:42 +02:00
parent 3a7a261f33
commit 3a1a00a4af
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
client/e2e/fixtures/video.mp4
View File

Binary file not shown.

12
client/e2e/protractor.conf.js
View File

@ -18,17 +18,17 @@ exports.config = {
}, },
multiCapabilities: [ multiCapabilities: [
{
browserName: 'Chrome',
name: 'Latest Chrome Desktop',
resolution: '1280x1024'
},
{ {
browserName: 'Safari', browserName: 'Safari',
version: '11.1', version: '11.1',
name: 'Safari Desktop', name: 'Safari Desktop',
resolution: '1280x1024' resolution: '1280x1024'
}, },
{
browserName: 'Chrome',
name: 'Latest Chrome Desktop',
resolution: '1280x1024'
},
{ {
browserName: 'Firefox', browserName: 'Firefox',
version: '60', // ESR, version: '60', // ESR,
@ -61,7 +61,7 @@ exports.config = {
} }
], ],
// maxSessions: 1, maxSessions: 1,
// BrowserStack compatible ports: https://www.browserstack.com/question/664 // BrowserStack compatible ports: https://www.browserstack.com/question/664
baseUrl: 'http://localhost:3333/', baseUrl: 'http://localhost:3333/',
framework: 'jasmine', framework: 'jasmine',

5
client/e2e/src/po/video-watch.po.ts
View File

@ -84,12 +84,13 @@ export class VideoWatchPage {
} }
async clickOnFirstVideo () { async clickOnFirstVideo () {
const video = element.all(by.css('.videos .video-miniature .video-miniature-name')).first() const video = element.all(by.css('.videos .video-miniature .video-thumbnail')).first()
const videoName = element.all(by.css('.videos .video-miniature .video-miniature-name')).first()
// Don't know why but the expectation fails on Safari // Don't know why but the expectation fails on Safari
await browser.wait(browser.ExpectedConditions.elementToBeClickable(video)) await browser.wait(browser.ExpectedConditions.elementToBeClickable(video))
const textToReturn = video.getText() const textToReturn = videoName.getText()
await video.click() await video.click()
await browser.wait(browser.ExpectedConditions.urlContains('/watch/')) await browser.wait(browser.ExpectedConditions.urlContains('/watch/'))