web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2025-03-03 15:12:49 +02:00
Code Releases Activity

chore: increase browserstack/karma timeouts, dispose player in tests (#4135)

Browse Source 
Increase timeout because IE8 can take more than 5 minutes to run.
Increase browser disconnect timeout so that browsers that succeed but don't report back to karma don't fail the build.
Make webpack more quiet.
Dispose players created in hooks tests which also increase stability.
This commit is contained in:
Gary Katsevman 2017-02-28 15:02:18 -05:00 committed by GitHub
parent 715f5847da
commit 6874fa2824
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/grunt.js
View File

@ -473,7 +473,7 @@ module.exports = function(grunt) {
}
},
webpack: {
command: 'webpack test/require/webpack.js build/temp/webpack.js',
command: 'webpack --hide-modules test/require/webpack.js build/temp/webpack.js',
options: {
preferLocal: true
}

15
test/karma.conf.js
View File

@ -63,10 +63,14 @@ module.exports = function(config) {
logLevel: config.LOG_INFO,
captureTimeout: 300000,
browserNoActivityTimeout: 300000,
browserDisconnectTimeout: 300000,
browserDisconnectTolerance: 3,
browserStack: {
name: process.env.TRAVIS_BUILD_NUMBER + process.env.TRAVIS_BRANCH,
pollingTimeout: 30000
pollingTimeout: 30000,
captureTimeout: 600,
timeout: 600
},
customLaunchers: getCustomLaunchers(),
@ -86,6 +90,15 @@ module.exports = function(config) {
},
{ type: 'text-summary' }
]
},
// make QUnit show the UI in karma runs
client: {
clearContext: false,
qunit: {
showUI: true,
testTimeout: 5000
}
}
};

6
test/unit/videojs-hooks.test.js
View File

@ -140,6 +140,8 @@ QUnit.test('should trigger beforesetup and setup during videojs setup', function
assert.ok(player.options_, 'returning null in beforesetup does not lose options');
assert.equal(beforeSetupCalled, true, 'beforeSetup was called');
assert.equal(setupCalled, true, 'setup was called');
player.dispose();
});
QUnit.test('beforesetup returns dont break videojs options', function(assert) {
@ -171,6 +173,8 @@ QUnit.test('beforesetup returns dont break videojs options', function(assert) {
assert.equal(player.options_.techOrder, vjsOptions.techOrder, 'options set by user should exist');
log.error = oldLogError;
player.dispose();
});
QUnit.test('beforesetup options override videojs options', function(assert) {
@ -191,4 +195,6 @@ QUnit.test('beforesetup options override videojs options', function(assert) {
assert.ok(player.options_, 'beforesetup should not destory options');
assert.equal(player.options_.techOrder, vjsOptions.techOrder, 'options set by user should exist');
assert.equal(player.options_.autoplay, true, 'autoplay should be set to true now');
player.dispose();
});