Merge remote-tracking branch 'weblate/develop' into develop

[github/Chocobozzz/PeerTube.git] / client / e2e / protractor.conf.js

diff --git a/client/e2e/protractor.conf.js b/client/e2e/protractor.conf.js
index 60b0ad9044732e87fa6d0a206a71d43fc5ec1557..be303bce416e37782016fdc1a7178842ef1e340a 100644 (file)
--- a/client/e2e/protractor.conf.js
+++ b/client/e2e/protractor.conf.js
@@ -5,48 +5,69 @@ const {SpecReporter} = require('jasmine-spec-reporter')
 
 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'
+    'browserstack.console': 'verbose',
+    'browserstack.networkLogs': true,
+    'browserstack.debug': true,
+    project: 'PeerTube',
+    build: 'Main',
+    name: 'Bstack-[Protractor] Parallel Test'
   },
 
   multiCapabilities: [
     {
-      browserName: 'Chrome',
-      version: '66'
+      browserName: 'Safari',
+      version: '11.1',
+      name: 'Safari Desktop',
+      resolution: '1280x1024'
     },
     {
-      browserName: 'Safari',
-      version: '11.1'
+      browserName: 'Chrome',
+      name: 'Latest Chrome Desktop',
+      resolution: '1280x1024'
     },
     {
       browserName: 'Firefox',
-      version: '52' // ESR
+      version: '60', // ESR,
+      name: 'Firefox ESR Desktop',
+      resolution: '1280x1024'
     },
     {
       browserName: 'Firefox',
-      version: '60'
+      name: 'Latest Firefox Desktop',
+      resolution: '1280x1024'
     },
     {
       browserName: 'Edge',
-      version: '16'
+      name: 'Latest Edge Desktop',
+      resolution: '1280x1024'
     },
     {
       browserName: 'Chrome',
       device: 'Google Nexus 6',
       realMobile: 'true',
-      os_version: '5.0'
+      os_version: '5.0',
+      name: 'Latest Chrome Android'
+    },
+    {
+      browserName: 'Safari',
+      device: 'iPhone 8',
+      realMobile: 'true',
+      os_version: '12',
+      name: 'Safari iPhone'
     },
     {
       browserName: 'Safari',
-      device: 'iPhone SE',
+      device: 'iPad 7th',
       realMobile: 'true',
-      os_version: '11.2'
+      os_version: '13',
+      name: 'Safari iPad'
     }
   ],
 
@@ -64,7 +85,9 @@ exports.config = {
     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: 'raw' }
+    }))
   }
 }