Skip to content

Commit 9e37b03

Browse files
committed
Update syntax
1 parent 15b05b4 commit 9e37b03

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

karma.conf.js

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var webpack = require('webpack');
1+
var webpack = require('webpack')
22

33
module.exports = function (config) {
44
// Browsers to run on BrowserStack
@@ -8,51 +8,51 @@ module.exports = function (config) {
88
os: 'Windows',
99
os_version: '8.1',
1010
browser: 'chrome',
11-
browser_version: '39.0',
11+
browser_version: '39.0'
1212
},
1313
BS_Firefox: {
1414
base: 'BrowserStack',
1515
os: 'Windows',
1616
os_version: '8.1',
1717
browser: 'firefox',
18-
browser_version: '32.0',
18+
browser_version: '32.0'
1919
},
2020
BS_Safari: {
2121
base: 'BrowserStack',
2222
os: 'OS X',
2323
os_version: 'Yosemite',
2424
browser: 'safari',
25-
browser_version: '8.0',
25+
browser_version: '8.0'
2626
},
2727
BS_MobileSafari: {
2828
base: 'BrowserStack',
2929
os: 'ios',
3030
os_version: '7.0',
3131
browser: 'iphone',
32-
real_mobile: false,
32+
real_mobile: false
3333
},
3434
// BS_InternetExplorer9: {
3535
// base: 'BrowserStack',
3636
// os: 'Windows',
3737
// os_version: '7',
3838
// browser: 'ie',
39-
// browser_version: '9.0',
39+
// browser_version: '9.0'
4040
// },
4141
BS_InternetExplorer10: {
4242
base: 'BrowserStack',
4343
os: 'Windows',
4444
os_version: '8',
4545
browser: 'ie',
46-
browser_version: '10.0',
46+
browser_version: '10.0'
4747
},
4848
BS_InternetExplorer11: {
4949
base: 'BrowserStack',
5050
os: 'Windows',
5151
os_version: '8.1',
5252
browser: 'ie',
53-
browser_version: '11.0',
54-
},
55-
};
53+
browser_version: '11.0'
54+
}
55+
}
5656

5757
config.set({
5858
customLaunchers: customLaunchers,
@@ -86,18 +86,18 @@ module.exports = function (config) {
8686
webpackServer: {
8787
noInfo: true
8888
}
89-
});
89+
})
9090

9191
if (process.env.USE_CLOUD) {
92-
config.browsers = Object.keys(customLaunchers);
93-
config.reporters = [ 'dots' ];
94-
config.browserDisconnectTimeout = 10000;
95-
config.browserDisconnectTolerance = 3;
96-
config.browserNoActivityTimeout = 30000;
97-
config.captureTimeout = 120000;
92+
config.browsers = Object.keys(customLaunchers)
93+
config.reporters = [ 'dots' ]
94+
config.browserDisconnectTimeout = 10000
95+
config.browserDisconnectTolerance = 3
96+
config.browserNoActivityTimeout = 30000
97+
config.captureTimeout = 120000
9898

9999
if (process.env.TRAVIS) {
100-
var buildLabel = 'TRAVIS #' + process.env.TRAVIS_BUILD_NUMBER + ' (' + process.env.TRAVIS_BUILD_ID + ')';
100+
var buildLabel = 'TRAVIS #' + process.env.TRAVIS_BUILD_NUMBER + ' (' + process.env.TRAVIS_BUILD_ID + ')'
101101

102102
config.browserStack = {
103103
username: process.env.BROWSER_STACK_USERNAME,
@@ -106,17 +106,17 @@ module.exports = function (config) {
106106
startTunnel: false,
107107
project: 'react-router',
108108
build: buildLabel,
109-
name: process.env.TRAVIS_JOB_NUMBER,
110-
};
109+
name: process.env.TRAVIS_JOB_NUMBER
110+
}
111111

112-
config.singleRun = true;
112+
config.singleRun = true
113113
} else {
114114
config.browserStack = {
115115
username: process.env.BROWSER_STACK_USERNAME,
116116
accessKey: process.env.BROWSER_STACK_ACCESS_KEY,
117117
pollingTimeout: 10000,
118-
startTunnel: true,
119-
};
118+
startTunnel: true
119+
}
120120
}
121121
}
122-
};
122+
}

0 commit comments

Comments
 (0)