[ADF-2629] Fix infinite pagination and e2e parallel task (#3691)

* change infinite pagination logic
make merge in share adapter a real merge

* missing semi column

* type problem

* fix pagination infinite test

* tentative file detector

* add other remote files for webdriver

* parallel execution test

* fix refresh browser e2e

* missing driver remote in util
This commit is contained in:
Eugenio Romano
2018-08-13 02:27:38 +01:00
committed by Eugenio Romano
parent 2602879cba
commit 83b2857097
19 changed files with 2866 additions and 2856 deletions

View File

@@ -4,6 +4,7 @@
const path = require('path');
const {SpecReporter} = require('jasmine-spec-reporter');
const jasmineReporters = require('jasmine-reporters');
const retry = require('protractor-retry').retry;
const projectRoot = path.resolve(__dirname);
@@ -19,9 +20,9 @@ var DIRECT_CONNECCT = SELENIUM_SERVER ? false : true;
var args_options = [];
if (BROWSER_RUN === 'true') {
args_options = ['--incognito', '--window-size=1366,768'];
args_options = ['--incognito', '--window-size=1366,768', '--disable-gpu'];
} else {
args_options = ['--incognito', '--headless', '--window-size=1366,768'];
args_options = ['--incognito', '--headless', '--window-size=1366,768', '--disable-gpu'];
}
var downloadFolder = path.join(__dirname, 'e2e/downloads');
@@ -35,6 +36,9 @@ exports.config = {
capabilities: {
browserName: 'chrome',
shardTestFiles: true,
maxInstances: 2,
chromeOptions: {
prefs: {
'credentials_enable_service': false,
@@ -77,7 +81,13 @@ exports.config = {
screenshotPath: `${projectRoot}/e2e-output/screenshots/`
}],
onCleanUp(results) {
retry.onCleanUp(results);
},
onPrepare() {
retry.onPrepare();
require('ts-node').register({
project: 'e2e/tsconfig.e2e.json'
});
@@ -112,5 +122,9 @@ exports.config = {
head.appendChild(style);
}
},
afterLaunch() {
return retry.afterLaunch(3);
}
};