Skip to content

Commit d412017

Browse files
authored
Merge pull request #1 from pine/feature/sl
Test in SourceLabs
2 parents c887fa7 + 0282607 commit d412017

File tree

3 files changed

+52
-2
lines changed

3 files changed

+52
-2
lines changed

.travis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ node_js:
44
- 5
55
- 6
66

7+
env:
8+
global:
9+
- secure: "sdshQcQmz9EFZQKZVEi9wcd9+RGsCaPP5ixQtDT58jPCWQF/NXzCaByOtyfB8nbJyq6n8t6SUFGlq25nB+4tqmKJkVS4pgK1B8fZolOS2vUjpPZGVUyaz1CKh2FRiZdwrE+2+I8NFY5Y/dcOvBUnFYiQV3pOvseK13esRVUvUbaXq06spE0yKuzGe5Chc+MMpSJPLt7gDN6+tx9vbHFsduLkH8WiExhB+AZi6wP/Nx9yHMtTiPb4z8r0jOIV6zLWg85kOo7lGUVPoPuWe2npw0UjozFctQ/X0YY0xkcgiK+FqgIXm2Aqxac0x8DASfdNg2XTiW9s08s7g7xcAhvMlNCiYa6/CViqZ/FAxoG22zmK4MmstSBxDkNAACv2dLaeyil8sbz9n+jvS5IVK1iIJDjoALG3tdwU/0qMX2rk5wLxKQ1TrpoO409PatD1/epeY8i6EarWqzI7gCygFRJnmQiEcuvKCH7Vhk8rsOpeqqkHLnLMVZFXRIyKEUljRgDfElwjl2WN1cQRv4BI7FUFvejoz38hGqjf96wcLMGU2B1PcH83QT2x5c20IJ4PPH6DMNy5tIgisv3GMieuzMQehdCdH4pSPFY15YJ9qHTdGrtadu0Jcnsfjm6DwXzJsRESYqj/uP/9xeIsWnAcljIAncuMPQTfnNMHV+qRnLhdQkc="
10+
- secure: "rp8sorryItC2Gs7DVHYlE5cXdL3oOmJ3pHtvNTebRDRGFec8BGHrdYvQCItLK/X8sU0XKGE0/S/WLyiXtPBdL3UyfhO9GwrRJXRXY5pRHnTQCYA8JyRcQEB+0LKek3BKWA0pTwv5HhrLUOorZHO6a4fV3xmchE4uKM1qM3abHIgged+ta6gUgVwx/9RzIoDczWNlJSGpbJUgLU532r4zCwh38V1usZPYl56HyPxi/RW1k/VJOXgNH5I9rkdrCH5AKm6yTKjG0QyekxsXgfgwjJqHQZsklCumOFzP861KoKlTb92ce5QJu3MpjK3BYkqU383k53S1ziTLbWZni0NkcqKCN2iYuwrFNnIan+6sGWvEYvmc+AsnyFEGiruohZaYuASrHMtpubS43yjhpIzLKCVN7bm74GiWliGbfR3A/0xCDjAx8LaaA3lhMgoVuicHCjQsYDJ0DZltsnIkCvBe4E31xDTSBh/2upAL77Cobiey1akaOJm+zpQ/7L+/lvJZhYWemj7PJCzjmYyVKMI4bj3b97lkWnKUJegG1Jkr3lGDiYxufo9EDaRnKigPh0xmyXWWKs2ND/5pVIFKjpOudeYjZU9xbg2TIc7qcLbL9rAkcLpg02CxP2KGAVABybGVAbwLFs6JTvEX7WADk7a1yi1nGwjkvJ55zgVjnTnpF6U="
11+
712
notifications:
813
slack:
914
- secure: "MjDAGvexP/xCDygixRGAWyKrZa1Wpi3VpgNUou6IVg6/E/crZmEHZ/fATAu21mQ+WcALfUTx1SLy3+jyLnVsWU/qKVOT/g1ogWbK5djTrf0v9r/jcy6GAdkPVnqZlLfhkNlNOvRqezNM4ijgo/WuF2d30z9iMJeyJui/ukNALq7j8Z6/sLpsga/VectAV4t7HRgypaqaazwpLb7kpkkr2EKjWYYjTihFNvdcAP40FeuRz8O5Qb5+9vxiRBFcnsF7/261O2OxA93pwJtsXOf7TBZDpEDhq5AB5csIav7+3PvIvTaCw9dQcyJAp6QOBDmlsNRwlFREFIx9EKnnBfLKeIaobjc4TQnGxmGZ+Wl9MnQsd9mk+KGfxLUU70OT1pI/sDeWbaw27t2+7pstPC9+ll4B7bScH4obHD32pWwR+kCpnCR/28sKneWKxDPP2f64eJEkWUCbNbCoBCzu2JEq6CM0v/Xej/rcwaedka71Uqj8cCmSC6ITr00JGn+70iy/x9xcH1X95DY9qJymHA7sriR4sE1kRsyIPV4jpCh7mnSHo/RfP8sMqlOP9K5svL1Bto6t9FwOfVsrl1rsf3D+3wx/tb1uOquKQrqYeb8G3l5HPj4JlEFHRZ/0H13a4SDQ130DCQX4k1vWa8jlFa1R2qcFP2jKoaUQozxeanHgXgQ="

karma.conf.js

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,49 @@
22

33
const path = require('path')
44

5+
const customLaunchers = {
6+
sl_chrome: {
7+
base: 'SauceLabs',
8+
browserName: 'chrome',
9+
platform: 'Windows 10',
10+
version: '51.0'
11+
},
12+
sl_firefox: {
13+
base: 'SauceLabs',
14+
browserName: 'firefox',
15+
platform: 'Windows 10',
16+
version: '47.0'
17+
},
18+
sl_ie: {
19+
base: 'SauceLabs',
20+
browserName: 'internet explorer',
21+
platform: 'Windows 7',
22+
version: '11.0',
23+
},
24+
sl_edge: {
25+
base: 'SauceLabs',
26+
browserName: 'MicrosoftEdge',
27+
platform: 'Windows 10',
28+
version: '13.10586'
29+
},
30+
sl_safari: {
31+
base: 'SauceLabs',
32+
browserName: 'safari',
33+
platform: 'OS X 10.11',
34+
version: '9.0',
35+
},
36+
}
37+
38+
const isTravis = process.env.TRAVIS === 'true'
39+
const isFirstJob = /\.1$/.test(process.env.TRAVIS_JOB_NUMBER)
40+
41+
const browsers = ['PhantomJS2']
42+
if (isTravis && isFirstJob) {
43+
Array.prototype.push.apply(browsers, Object.keys(customLaunchers))
44+
}
45+
546
module.exports = function(config) {
47+
648
config.set({
749
basePath: '',
850
files: [
@@ -14,14 +56,16 @@ module.exports = function(config) {
1456
},
1557

1658
frameworks: ['mocha', 'chai'],
17-
reporters: ['mocha'],
59+
reporters: ['mocha', 'saucelabs'],
1860

1961
port: 9876,
2062
colors: true,
2163
logLevel: config.LOG_INFO,
2264
autoWatch: true,
23-
browsers: ['PhantomJS2'],
65+
browsers: browsers,
66+
customLaunchers: customLaunchers,
2467
singleRun: true,
68+
concurrency: 3,
2569

2670
webpack: {
2771
devtool: 'inline-source-map',

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"karma-mocha": "^1.1.1",
2525
"karma-mocha-reporter": "^2.0.4",
2626
"karma-phantomjs2-launcher": "^0.5.0",
27+
"karma-sauce-launcher": "^1.0.0",
2728
"karma-sourcemap-loader": "^0.3.7",
2829
"karma-webpack": "^1.7.0",
2930
"mocha": "^3.0.0",

0 commit comments

Comments
 (0)