Skip to content

Commit e9c713a

Browse files
committed
Use a different sauce account, only use a single browser.
There seems to be an issue with 'beforeLaunch' and multicapabilities that breaks ts-node when launching.
1 parent f41ff0d commit e9c713a

2 files changed

Lines changed: 27 additions & 37 deletions

File tree

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ os:
66

77
addons:
88
sauce_connect:
9-
username: "mgiambalvo"
9+
username: "notkit"
1010
jwt:
11-
secure: "EYOYWOj2TyoPvUIl0ZCAbBwdvwj6gZV+hYIpILm8sp6Dtgp6+5NFvK1+5x4d4sIBjSKhstJFjtd7SMgvFeffEyoixtTvApArb4RI2g2gOHgxG5TkEysIOHp3TGUSKBM+u9wB3txJxH93jQdqbp1MuPI1lcoOXER8UmfKIKxjN7mAbXJ6+oEAWEv8c5hvxGP1BrXA5U6JTpcS5pQdwkm7mbAlH0PQ6ogOPuVCBh0eZDUp/s588GT1OSqLvhUoHJ6+w7D0QXUly/XCz+B7ppKgQtdfLrrSCGXilQT7SyQ78UZ5tqFdQeH0wrO2rzwePQ30N1EC7HbQCRlRNb866aB4ykgmJnHEURs0NsuHqpZmT4rX2NBZPOZC0SVaqrNSwmBYrIKjmyN/z6OoCs9RPqsM7TN57x7cCZL5bX8LyOfgdV/CGE2vkO7HG+t/dykEqKCYPIMcu6/fSRT99HrZSRw/4NKQPT/fn+n8phTh0gFqpODl2/weBLm41zTH73dzorwhHEN8MtVFJbjcTxdYRMwFHKkOhJTLS0W0nMXCNDxj9p0iCfH9Os6U6CdRq3UnZGI7I2QnFBM+wE2VpAHZzhXcWJushEfKJi4VndxnGbOPby38U+DU2SyNaksyNaEN0uqfHA+QLtfoIcfMXKRTW4L69U+OCSNj3WRMtkJt6ubaJ/M="
11+
secure: "r7M8cgpDqP8NeJThQBCfqsCJDOVI/+HASWjirtHiKjnPGNu7hgPdAISn+gQP+w5RwC8HNysprNKNzSHm+wcUACZH+3zBxj9lVHB7V1dXcWV1W/kegvjaXnpo45V/1pJRft8EVKZSExncGegLz/RkM01d/b/EZvXSzViVoSgXWr4wXrRnH0yshqH1DswrDGfh31HpCP7XA75g9nPohZrJaX0ChsWQS5wUKKNRsbwdyNV5A2tl1BlJnYxMXMysbiiXBj++21lltSBJa5hT1GQKsJ9pGVyWdopWYXFFgRtxn4AJwM9N9e6Ns44m3sP6v3uYyYtlTgB+TBECHi4u5FrTaSiFgFpjk6Z+ljihrZ/iPWn1MQpfjuPlKdwOd6hfFLd79M/uw1Ih+0q0HGER01QwjvrA7nGCLu74SED60cu9UuJqSBQJceZ5nHmde3GMJHbw/u4RRiuWSU/7W/DoqGCLh/Q0FSYBeKTgN81NesUJp/Vk0xk5sPdRo3JuHDzqsFe6+6NMkqo46h3/G6ChfAhgyUAlPwPgVgWR8j6RHbZWgxsRll2KwmPXxzqoSct9OSsUQP4cIO1PrvmbZv933cPYppjjLKOV9RQsmUClZmzRqShcKB1Xt3ITdywTLaG/mKo5SrlQdol3y3Nkee+lzOpl8O91gNdHbgoYhpM+5OSoar8="
1212

1313
env:
1414
global:
Lines changed: 25 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,38 @@
1-
var defaultConfig = require('./protractor.conf.js').config;
2-
31
var testName = 'Tour of Heroes Smoke Tests'
2+
var SpecReporter = require('jasmine-spec-reporter');
43

5-
var ciConfig = {
6-
// Note that seleniumAddress must be unset in order for SauceLabs to work.
7-
seleniumAddress: false,
4+
exports.config = {
85
sauceUser: process.env.SAUCE_USERNAME,
96
sauceKey: process.env.SAUCE_ACCESS_KEY,
107

11-
directConnect: false,
12-
multiCapabilities: [{
13-
'browserName': 'chrome',
14-
'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER,
15-
'build': process.env.TRAVIS_BUILD_NUMBER,
16-
'name': testName,
17-
'version': '51',
18-
'selenium-version': '2.53.1',
19-
'chromedriver-version': '2.22',
20-
'platform': 'OS X 10.9'
21-
}, {
22-
'browserName': 'firefox',
23-
'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER,
24-
'build': process.env.TRAVIS_BUILD_NUMBER,
25-
'name': testName,
26-
'version': '44',
27-
'selenium-version': '2.53.1'
28-
}, {
29-
'browserName': 'safari',
30-
'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER,
31-
'build': process.env.TRAVIS_BUILD_NUMBER,
32-
'name': testName,
33-
'version': '9',
34-
'selenium-version': '2.44.0' // Use an old version because Safari has
35-
// issues loading pages after 2.44.
36-
}, {
8+
capabilities: {
379
'browserName': 'internet explorer',
3810
'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER,
3911
'build': process.env.TRAVIS_BUILD_NUMBER,
4012
'name': testName,
4113
'version': '11',
4214
'selenium-version': '2.53.1',
4315
'platform': 'Windows 7'
44-
}]
45-
};
16+
},
4617

47-
exports.config = Object.assign(defaultConfig, ciConfig);
48-
console.log(exports.config);
18+
allScriptsTimeout: 30000,
19+
specs: [
20+
'./e2e/**/*.e2e-spec.ts'
21+
],
22+
baseUrl: 'http://localhost:4200/',
23+
framework: 'jasmine',
24+
jasmineNodeOpts: {
25+
showColors: true,
26+
defaultTimeoutInterval: 30000,
27+
print: function() {}
28+
},
29+
useAllAngular2AppRoots: true,
30+
beforeLaunch: function() {
31+
require('ts-node').register({
32+
project: 'e2e'
33+
});
34+
},
35+
onPrepare: function() {
36+
jasmine.getEnv().addReporter(new SpecReporter());
37+
}
38+
};

0 commit comments

Comments
 (0)