aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/e2e
diff options
context:
space:
mode:
Diffstat (limited to 'client/e2e')
-rw-r--r--client/e2e/protractor.conf.js19
-rw-r--r--client/e2e/src/po/video-upload.po.ts3
2 files changed, 13 insertions, 9 deletions
diff --git a/client/e2e/protractor.conf.js b/client/e2e/protractor.conf.js
index 932eaed51..82daa435e 100644
--- a/client/e2e/protractor.conf.js
+++ b/client/e2e/protractor.conf.js
@@ -8,16 +8,17 @@ exports.config = {
8 specs: [ 8 specs: [
9 './src/**/*.e2e-spec.ts' 9 './src/**/*.e2e-spec.ts'
10 ], 10 ],
11 multiCapabilities: [ 11
12 { 12 seleniumAddress: 'http://hub-cloud.browserstack.com/wd/hub',
13 'browserName': 'firefox', 13 capabilities: {
14 'moz:firefoxOptions': { 14 'browserstack.user': process.env.BROWSERSTACK_USER,
15 binary: 'firefox-developer' 15 'browserstack.key': process.env.BROWSERSTACK_KEY,
16 } 16 'browserName': 'chrome',
17 } 17 'browserstack.local': true,
18 ], 18 'project': 'PeerTube'
19 },
20
19 maxSessions: 1, 21 maxSessions: 1,
20 directConnect: true,
21 baseUrl: 'http://localhost:4200/', 22 baseUrl: 'http://localhost:4200/',
22 framework: 'jasmine', 23 framework: 'jasmine',
23 jasmineNodeOpts: { 24 jasmineNodeOpts: {
diff --git a/client/e2e/src/po/video-upload.po.ts b/client/e2e/src/po/video-upload.po.ts
index 4f09bb2fa..741914d2d 100644
--- a/client/e2e/src/po/video-upload.po.ts
+++ b/client/e2e/src/po/video-upload.po.ts
@@ -1,5 +1,6 @@
1import { browser, element, by } from 'protractor' 1import { browser, element, by } from 'protractor'
2import { join } from 'path' 2import { join } from 'path'
3import { FileDetector } from 'selenium-webdriver/remote'
3 4
4export class VideoUploadPage { 5export class VideoUploadPage {
5 navigateTo () { 6 navigateTo () {
@@ -7,6 +8,8 @@ export class VideoUploadPage {
7 } 8 }
8 9
9 async uploadVideo () { 10 async uploadVideo () {
11 browser.setFileDetector(new FileDetector())
12
10 const fileToUpload = join(__dirname, '../../fixtures/video.mp4') 13 const fileToUpload = join(__dirname, '../../fixtures/video.mp4')
11 14
12 await element(by.css('.upload-video-container input[type=file]')).sendKeys(fileToUpload) 15 await element(by.css('.upload-video-container input[type=file]')).sendKeys(fileToUpload)