Skip to content

Commit 7068ffe

Browse files
committed
disable webvr in tests to avoid starting SteamVR
1 parent b30dbb7 commit 7068ffe

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

machinima_tests/karma.conf.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,21 @@ var karmaConf = {
66
['babelify']
77
]
88
},
9-
browsers: ['Firefox', 'Chrome'],
9+
browsers: ['Firefox_NoVR', 'Chrome'],
1010
// machinima: prevent timeout during recording playback
1111
browserNoActivityTimeout: 600000,
1212
client: {
1313
captureConsole: false,
1414
mocha: {'ui': 'tdd'}
1515
},
16+
customLaunchers: {
17+
Firefox_NoVR: {
18+
base: 'Firefox',
19+
prefs: {
20+
'dom.vr.enabled': false
21+
}
22+
}
23+
},
1624
files: [
1725
// module and dependencies
1826
{pattern: 'main.js', included: true},

tests/karma.conf.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ var karmaConf = {
77
['babelify']
88
]
99
},
10-
browsers: ['Chrome', 'Firefox'],
10+
browsers: ['Chrome', 'Firefox_NoVR'],
1111
// browsers: ['FirefoxNightly', 'Chromium_WebVR'],
1212
client: {
1313
captureConsole: true,
@@ -17,6 +17,12 @@ var karmaConf = {
1717
Chromium_WebVR: {
1818
base: 'Chromium',
1919
flags: ['--enable-webvr', '--enable-gamepad-extensions']
20+
},
21+
Firefox_NoVR: {
22+
base: 'Firefox',
23+
prefs: {
24+
'dom.vr.enabled': false
25+
}
2026
}
2127
},
2228
envPreprocessor: [

0 commit comments

Comments
 (0)