
committed by
Andrew Kushnir

parent
c7346bfdba
commit
c7d1890aaa
@ -10,23 +10,6 @@
|
||||
// as this could exit node if the help script should be printed.
|
||||
require('./dist/all/e2e_util/e2e_util').readCommandLine();
|
||||
|
||||
var BROWSER_OPTIONS = {
|
||||
LocalChrome: {
|
||||
'browserName': 'chrome',
|
||||
|
||||
// Enables concurrent testing. Currently runs four e2e files in parallel.
|
||||
shardTestFiles: true,
|
||||
maxInstances: 4,
|
||||
},
|
||||
ChromeOnTravis: {
|
||||
browserName: 'chrome',
|
||||
chromeOptions: {
|
||||
'args': ['--no-sandbox'],
|
||||
'binary': process.env.CHROME_BIN,
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
exports.config = {
|
||||
onPrepare: function() { beforeEach(function() { browser.ignoreSynchronization = false; }); },
|
||||
allScriptsTimeout: 11000,
|
||||
@ -36,7 +19,12 @@ exports.config = {
|
||||
'**/key_events/**', // can't tell why this is failing
|
||||
'**/sourcemap/**' // fails only on travis
|
||||
],
|
||||
capabilities: process.env.TRAVIS ? BROWSER_OPTIONS.ChromeOnTravis : BROWSER_OPTIONS.LocalChrome,
|
||||
capabilities: {
|
||||
'browserName': 'chrome',
|
||||
// Enables concurrent testing. Currently runs four e2e files in parallel.
|
||||
shardTestFiles: true,
|
||||
maxInstances: 4,
|
||||
},
|
||||
directConnect: true,
|
||||
baseUrl: 'http://localhost:8000/',
|
||||
framework: 'jasmine2',
|
||||
|
Reference in New Issue
Block a user