Skip to content

Commit cb117f1

Browse files
committed
ci: fix chrome race condition on travis
1 parent c477eb2 commit cb117f1

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

.travis.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@ cache:
88
directories:
99
- ./node_modules
1010

11-
env:
12-
global:
13-
- DBUS_SESSION_BUS_ADDRESS=/dev/null
14-
15-
1611
matrix:
1712
fast_finish: true
1813
allow_failures:
@@ -109,6 +104,7 @@ install:
109104

110105
env:
111106
global:
107+
- DBUS_SESSION_BUS_ADDRESS=/dev/null
112108
# GITHUB_ACCESS_TOKEN=<github token, a personal access token of the angular-builds account, account access in valentine>
113109
# This is needed to publish packages to github for continuous packages delivery.
114110
- secure: "XUM1RCN/ZH34ju2PI9eHPRMnSlbj45XcBx/ZnZ13wfau60iJCveU7Ded8SC8uwGDp58rGGePXyJfh5l5dAnIWbSAGNKlrEgGTr41RSCbyzrV6m4lAcwNzUo/PkKum1vAApk21PqscrSSWOBAOC3nMCln25GLzgUMm6G8FBOc599NuszcoQvru+H+4JthSHn4l/nmeTZDs2oCBvwnmng/78rEW5CXvJEpAwuaaZLvzzIFdoZu+SuceYvGnL5xHo0ppPF/0NYzZlb7KBKREp44Lq1lOKlDtH5wqjEi7b2aA7/GnesOgLUBmbbSVUzmCxs6PtzGhD56aiL2Qtu8c4LZyvNfzPXSLbx8ljYmdytHkio9w3377wWFRXJDfIsgv9JKHxxyA0T34yzQkqWbgWKPMgJ3om+lb875iXAtXfNyS0trnN+rwLZZtFxygjHyx8IWY+NZD5i5fyjMdFyetNxbHe3ktI73nY+Tl6hDqJXvN8WwQlMovLNUMcY4wGUoPooLka9L+94uetbf3U4KVgshrLHI59jMZsO0qrDGsCZMubHEy80acrNkCTi/uGIbVR0KF94z81VF+S7edYv80AkQTRijpgNV34045L/IqSHgbueozRgVFj2arkAGGFjLlZJifmsRC/Eq1ZWkKsKY/1NusKssCRtycJQjeLOW0qV1T0w="

tests/e2e/setup/500-create-project.ts

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {join} from 'path';
22
import {git, ng, silentNpm} from '../utils/process';
3-
import {expectFileToExist} from '../utils/fs';
3+
import {expectFileToExist, replaceInFile} from '../utils/fs';
44
import {updateTsConfig, updateJsonFile, useNg2} from '../utils/project';
55
import {gitClean, gitCommit} from '../utils/git';
66
import {getGlobalVariable} from '../utils/env';
@@ -36,6 +36,16 @@ export default function() {
3636
json['dependencies'][pkgName] = packages[pkgName].tar;
3737
});
3838
}))
39+
// There's a race condition happening in Chrome. Enabling logging in chrome used by
40+
// protractor actually fixes it. Logging is piped to a file so it doesn't affect our setup.
41+
.then(() => replaceInFile('protractor.conf.js', `'browserName': 'chrome'`,
42+
`'browserName': 'chrome',
43+
chromeOptions: {
44+
args: [
45+
"--enable-logging",
46+
]
47+
}
48+
`))
3949
.then(() => argv['ng2'] ? useNg2() : Promise.resolve())
4050
.then(() => {
4151
if (argv['nightly'] || argv['ng-sha']) {

0 commit comments

Comments
 (0)