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

test(hooks): remove errors logged in tests (#3865)

Browse Source
This commit is contained in:
Gary Katsevman 2016-12-15 15:48:03 -05:00 committed by GitHub
parent 559297a376
commit 3f724f9349
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/video.js
View File

@ -118,7 +118,7 @@ function videojs(id, options, ready) {
const opts = hookFunction(tag, mergeOptions(options)); const opts = hookFunction(tag, mergeOptions(options));
if (!isObject(opts) || Array.isArray(opts)) { if (!isObject(opts) || Array.isArray(opts)) {
videojs.log.error('please return an object in beforesetup hooks'); log.error('please return an object in beforesetup hooks');
return; return;
} }

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

@ -1,6 +1,7 @@
/* eslint-env qunit */ /* eslint-env qunit */
import videojs from '../../src/js/video.js'; import videojs from '../../src/js/video.js';
import document from 'global/document'; import document from 'global/document';
import log from '../../src/js/utils/log.js';
QUnit.module('video.js:hooks ', { QUnit.module('video.js:hooks ', {
beforeEach() { beforeEach() {
@ -112,6 +113,8 @@ QUnit.test('should trigger beforesetup and setup during videojs setup', function
assert.equal(setupCalled, false, 'setup should be called after beforesetup'); assert.equal(setupCalled, false, 'setup should be called after beforesetup');
assert.deepEqual(options, vjsOptions, 'options should be the same'); assert.deepEqual(options, vjsOptions, 'options should be the same');
assert.equal(video.id, 'test_vid_id', 'video id should be correct'); assert.equal(video.id, 'test_vid_id', 'video id should be correct');
return options;
}; };
const setup = function(player) { const setup = function(player) {
setupCalled = true; setupCalled = true;
@ -140,9 +143,14 @@ QUnit.test('should trigger beforesetup and setup during videojs setup', function
}); });
QUnit.test('beforesetup returns dont break videojs options', function(assert) { QUnit.test('beforesetup returns dont break videojs options', function(assert) {
const oldLogError = log.error;
const vjsOptions = {techOrder: ['techFaker']}; const vjsOptions = {techOrder: ['techFaker']};
const fixture = document.getElementById('qunit-fixture'); const fixture = document.getElementById('qunit-fixture');
log.error = function(err) {
assert.equal(err, 'please return an object in beforesetup hooks', 'we have the correct error');
};
fixture.innerHTML += '<video id="test_vid_id"><source type="video/mp4"></video>'; fixture.innerHTML += '<video id="test_vid_id"><source type="video/mp4"></video>';
const vid = document.getElementById('test_vid_id'); const vid = document.getElementById('test_vid_id');
@ -161,6 +169,8 @@ QUnit.test('beforesetup returns dont break videojs options', function(assert) {
assert.ok(player.options_, 'beforesetup should not destory options'); 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_.techOrder, vjsOptions.techOrder, 'options set by user should exist');
log.error = oldLogError;
}); });
QUnit.test('beforesetup options override videojs options', function(assert) { QUnit.test('beforesetup options override videojs options', function(assert) {