exports.config = {
allScriptsTimeout: 25000,
- specs: [
- './src/**/*.e2e-spec.ts'
- ],
+ specs: ['./src/**/*.e2e-spec.ts'],
seleniumAddress: 'http://hub-cloud.browserstack.com/wd/hub',
commonCapabilities: {
'browserstack.user': process.env.BROWSERSTACK_USER,
'browserstack.key': process.env.BROWSERSTACK_KEY,
'browserstack.local': true,
- 'project': 'PeerTube'
+ projec: 'PeerTube'
},
multiCapabilities: [
},
{
browserName: 'Safari',
- version: '11.1'
+ version: '11.1',
+ resolution: '1920x1080'
},
{
browserName: 'Firefox',
realMobile: 'true',
os_version: '5.0'
},
- // {
- // browserName: 'Safari',
- // device: 'iPhone 6s',
- // realMobile: 'true',
- // os_version: '9.0'
- // },
- // {
- // browserName: 'Safari',
- // device: 'iPhone SE',
- // realMobile: 'true',
- // os_version: '11.2'
- // }
+ {
+ browserName: 'Safari',
+ device: 'iPhone SE',
+ realMobile: 'true',
+ os_version: '11.2'
+ }
],
- maxSessions: 1,
+ // maxSessions: 1,
// BrowserStack compatible ports: https://www.browserstack.com/question/664
baseUrl: 'http://localhost:3333/',
framework: 'jasmine',
jasmineNodeOpts: {
showColors: true,
defaultTimeoutInterval: 45000,
- print: function () {}
+ print: function() {}
},
- onPrepare () {
+ onPrepare() {
require('ts-node').register({
project: require('path').join(__dirname, './tsconfig.e2e.json')
})
- jasmine.getEnv().addReporter(new SpecReporter({spec: {displayStacktrace: true}}))
+ jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }))
}
}
import { join } from 'path'
export class VideoUploadPage {
- navigateTo () {
- return browser.get('/videos/upload')
+ async navigateTo () {
+ await element(by.css('.header .upload-button')).click()
+
+ return browser.wait(browser.ExpectedConditions.visibilityOf(element(by.css('.upload-video-container'))))
}
async uploadVideo () {
browser.setFileDetector(new FileDetector())
const fileToUpload = join(__dirname, '../../fixtures/video.mp4')
+ const fileInputSelector = '.upload-video-container input[type=file]'
+ const parentFileInput = '.upload-video .button-file'
+
+ // Avoid sending keys on non visible element
+ await browser.executeScript(`document.querySelector('${fileInputSelector}').style.opacity = 1`)
+ // await browser.executeScript(`document.querySelector('${fileInputSelector}').style.opacity = 1`)
+ await browser.executeScript(`document.querySelector('${parentFileInput}').style.overflow = 'initial'`)
- await element(by.css('.upload-video-container input[type=file]')).sendKeys(fileToUpload)
+ const elem = element(by.css(fileInputSelector))
+ await elem.sendKeys(fileToUpload)
// Wait for the upload to finish
await browser.wait(browser.ExpectedConditions.elementToBeClickable(this.getSecondStepSubmitButton()))
import { by, element, browser } from 'protractor'
export class VideoWatchPage {
- async goOnVideosList (isIphoneDevice: boolean) {
+ async goOnVideosList (isIphoneDevice: boolean, isSafari: boolean) {
let url: string
if (isIphoneDevice === true) {
}
await browser.get(url)
- return browser.wait(browser.ExpectedConditions.elementToBeClickable(element(this.getFirstVideoListSelector())))
+
+ // Waiting the following element does not work on Safari...
+ if (isSafari === true) return browser.sleep(3000)
+
+ const elem = element.all(by.css('.videos .video-miniature .video-miniature-name')).first()
+ return browser.wait(browser.ExpectedConditions.visibilityOf(elem))
}
getVideosListName () {
- return element.all(this.getFirstVideoListSelector())
+ return element.all(by.css('.videos .video-miniature .video-miniature-name'))
.getText()
.then((texts: any) => texts.map(t => t.trim()))
}
.then(seconds => parseInt(seconds, 10))
}
- async pauseVideo (pauseAfterMs: number, isMobileDevice: boolean, isIphoneDevice: boolean) {
- if (isMobileDevice === true) {
- if (isIphoneDevice === false) {
- const playButton = element(by.css('.vjs-big-play-button'))
- await browser.wait(browser.ExpectedConditions.elementToBeClickable(playButton))
- await playButton.click()
- } else {
- const playButton = element(by.css('video'))
- await browser.wait(browser.ExpectedConditions.elementToBeClickable(playButton))
- await playButton.click()
- }
+ async pauseVideo (pauseAfterMs: number, isAutoplay: boolean, isSafari: boolean) {
+ if (isAutoplay === false) {
+ const playButton = element(by.css('.vjs-big-play-button'))
+ await browser.wait(browser.ExpectedConditions.elementToBeClickable(playButton))
+ await playButton.click()
+ }
+
+ if (isSafari === true) {
+ await browser.sleep(1000)
+ await element(by.css('.vjs-play-control')).click()
}
+ await browser.sleep(1000)
await browser.wait(browser.ExpectedConditions.invisibilityOf(element(by.css('.vjs-loading-spinner'))))
const el = element(by.css('div.video-js'))
await browser.sleep(pauseAfterMs)
- if (isIphoneDevice === true) {
- // document.webkitCancelFullScreen()
- } else {
- return el.click()
- }
+ return el.click()
}
async clickOnVideo (videoName: string) {
}
async clickOnFirstVideo () {
- const video = element(by.css('.videos .video-miniature:first-child .video-miniature-name'))
+ const video = element.all(by.css('.videos .video-miniature .video-miniature-name')).first()
await browser.wait(browser.ExpectedConditions.elementToBeClickable(video))
const textToReturn = video.getText()
return textToReturn
}
- private getFirstVideoListSelector () {
- return by.css('.videos .video-miniature-name')
+ async goOnAssociatedEmbed () {
+ let url = await browser.getCurrentUrl()
+ url = url.replace('/watch/', '/embed/')
+ url = url.replace(':3333', ':9001')
+
+ return browser.get(url)
}
}
const videoName = new Date().getTime() + ' video'
let isMobileDevice = false
let isIphoneDevice = false
+ let isSafari = false
beforeEach(async () => {
browser.waitForAngularEnabled(false)
const caps = await browser.getCapabilities()
isMobileDevice = caps.get('realMobile') === 'true' || caps.get('realMobile') === true
isIphoneDevice = caps.get('device') === 'iphone'
+ isSafari = caps.get('browserName') && caps.get('browserName').toLowerCase() === 'safari'
})
it('Should log in', () => {
return
}
- pageUploadPage.navigateTo()
+ await pageUploadPage.navigateTo()
await pageUploadPage.uploadVideo()
return pageUploadPage.validSecondUploadStep(videoName)
})
it('Should list the video', async () => {
- await videoWatchPage.goOnVideosList(isIphoneDevice)
+ await videoWatchPage.goOnVideosList(isIphoneDevice, isSafari)
if (isMobileDevice) {
console.log('Skipping because we are on a real device and BrowserStack does not support file upload.')
it('Should go on video watch page', async () => {
let videoNameToExcept = videoName
- if (isMobileDevice && isIphoneDevice) videoNameToExcept = 'PeerTube_Mobile.v.1'
-
- if (isMobileDevice && isIphoneDevice === false) videoNameToExcept = await videoWatchPage.clickOnFirstVideo()
+ if (isMobileDevice) videoNameToExcept = await videoWatchPage.clickOnFirstVideo()
else await videoWatchPage.clickOnVideo(videoName)
return videoWatchPage.waitWatchVideoName(videoNameToExcept)
})
it('Should play the video', async () => {
- await videoWatchPage.pauseVideo(7000, isMobileDevice, isIphoneDevice)
+ await videoWatchPage.pauseVideo(7000, !isMobileDevice, isSafari)
+ expect(videoWatchPage.getWatchVideoPlayerCurrentTime()).toBeGreaterThanOrEqual(2)
+ })
+
+ it('Should watch the associated embed video', async () => {
+ await videoWatchPage.goOnAssociatedEmbed()
+
+ await videoWatchPage.pauseVideo(7000, false, isSafari)
expect(videoWatchPage.getWatchVideoPlayerCurrentTime()).toBeGreaterThanOrEqual(2)
})
})
import { VideoFile } from '../../../../shared/models/videos'
-import 'core-js/es6/symbol';
-import 'core-js/es6/object';
-import 'core-js/es6/function';
-import 'core-js/es6/parse-int';
-import 'core-js/es6/parse-float';
-import 'core-js/es6/number';
-import 'core-js/es6/math';
-import 'core-js/es6/string';
-import 'core-js/es6/date';
-import 'core-js/es6/array';
-import 'core-js/es6/regexp';
-import 'core-js/es6/map';
-import 'core-js/es6/weak-map';
-import 'core-js/es6/set';
-import 'core-js/es7/object';
-
import 'videojs-hotkeys'
import 'videojs-dock'
import './peertube-link-button'
import { renderVideo } from './video-renderer'
import './settings-menu-button'
import { PeertubePluginOptions, VideoJSComponentInterface, videojsUntyped } from './peertube-videojs-typings'
-import { getAverageBandwidth, getStoredMute, getStoredVolume, saveAverageBandwidth, saveMuteInStore, saveVolumeInStore } from './utils'
+import {
+ getAverageBandwidth,
+ getStoredMute,
+ getStoredVolume,
+ isMobile,
+ saveAverageBandwidth,
+ saveMuteInStore,
+ saveVolumeInStore
+} from './utils'
import minBy from 'lodash-es/minBy'
import maxBy from 'lodash-es/maxBy'
import * as CacheChunkStore from 'cache-chunk-store'
private tryToPlay (done?: Function) {
if (!done) done = function () { /* empty */ }
-
const playPromise = this.player.play()
if (playPromise !== undefined) {
return playPromise.then(done)
// Proxy first play
const oldPlay = this.player.play.bind(this.player)
this.player.play = () => {
+ // Avoid issue new play policy on mobiles
+ if (isMobile()) oldPlay()
+
this.player.addClass('vjs-has-big-play-button-clicked')
this.player.play = oldPlay
return setLocalStorage('average-bandwidth', value.toString())
}
+function isMobile () {
+ return /iPhone|iPad|iPod|Android/i.test(navigator.userAgent)
+}
+
export {
toTitleCase,
getStoredVolume,
getAverageBandwidth,
saveMuteInStore,
getStoredMute,
+ isMobile,
bytes
}
import './embed.scss'
+import 'core-js/es6/symbol'
+import 'core-js/es6/object'
+import 'core-js/es6/function'
+import 'core-js/es6/parse-int'
+import 'core-js/es6/parse-float'
+import 'core-js/es6/number'
+import 'core-js/es6/math'
+import 'core-js/es6/string'
+import 'core-js/es6/date'
+import 'core-js/es6/array'
+import 'core-js/es6/regexp'
+import 'core-js/es6/map'
+import 'core-js/es6/weak-map'
+import 'core-js/es6/set'
+
// For google bot that uses Chrome 41 and does not understand fetch
import 'whatwg-fetch'
"jsonld": "^1.0.1",
"jsonld-signatures": "https://github.com/Chocobozzz/jsonld-signatures#rsa2017",
"kue": "^0.11.6",
- "lodash": "^4.11.1",
+ "lodash": "^4.17.10",
"magnet-uri": "^5.1.4",
"mkdirp": "^0.5.1",
"morgan": "^1.5.3",
(
cd client
npm run webdriver-manager update
+ npm run webpack -- --config webpack/webpack.video-embed.js --mode development
)
concurrently -k -s first \
projects / oweals / peertube.git / commitdiff