Skip to content

Commit 953c7a5

Browse files
authored
Merge pull request #9 from samirans89/master
add config for Karma browser disconnects and timeouts
2 parents e633738 + 7a7018e commit 953c7a5

File tree

2 files changed

+21
-12
lines changed

2 files changed

+21
-12
lines changed

karma.conf.js

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,11 @@ module.exports = function(config) {
3939
// test results reporter to use
4040
// possible values: 'dots', 'progress'
4141
// available reporters: https://npmjs.org/browse/keyword/karma-reporter
42-
reporters: ['progress'],
42+
reporters: ['progress', 'BrowserStack'],
4343

4444

45-
// web server port
45+
// web server host and port
46+
hostname: 'bs-local.com',
4647
port: 9876,
4748

4849

@@ -57,30 +58,38 @@ module.exports = function(config) {
5758

5859
// enable / disable watching file and executing tests whenever any file changes
5960
autoWatch: false,
60-
61+
6162
browserStack: {
6263
username: process.env.BROWSERSTACK_USERNAME,
63-
accessKey: process.env.BROWSERSTACK_KEY
64+
accessKey: process.env.BROWSERSTACK_KEY,
65+
apiClientEndpoint: 'https://api.browserstack.com'
6466
},
6567

6668
// define browsers
6769
customLaunchers: {
6870
bs_firefox_mac: {
6971
base: 'BrowserStack',
7072
browser: 'firefox',
71-
browser_version: '21.0',
73+
browser_version: '70.0',
7274
os: 'OS X',
73-
os_version: 'Mountain Lion'
75+
os_version: 'High Sierra'
7476
},
75-
bs_iphone5: {
77+
bs_iphoneX: {
7678
base: 'BrowserStack',
77-
device: 'iPhone 5',
79+
device: 'iPhone X',
7880
os: 'ios',
79-
os_version: '6.0'
81+
real_mobile: true,
82+
os_version: '11.0'
8083
}
8184
},
8285

83-
browsers: ['bs_firefox_mac', 'bs_iphone5'],
86+
captureTimeout: 3e5,
87+
browserDisconnectTolerance: 0,
88+
browserDisconnectTimeout: 3e5,
89+
browserSocketTimeout: 1.2e5,
90+
browserNoActivityTimeout: 3e5,
91+
92+
browsers: ['bs_firefox_mac', 'bs_iphoneX'],
8493
// start these browsers
8594
// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
8695

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
},
2121
"homepage": "https://github.com/browserstack/karma-browserstack-example#readme",
2222
"dependencies": {
23-
"karma": "^0.13.11",
24-
"karma-browserstack-launcher": "^0.1.5",
23+
"karma": "^4.4.1",
24+
"karma-browserstack-launcher": "^1.5.1",
2525
"karma-qunit": "^0.1.5",
2626
"qunitjs": "^1.19.0"
2727
}

0 commit comments

Comments
 (0)