-
Notifications
You must be signed in to change notification settings - Fork 7.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix extra warn logs on already initialized player references #3888
Merged
gkatsev
merged 3 commits into
videojs:master
from
gesinger:fix-log-warn-options-videojs
Dec 23, 2016
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,6 +2,7 @@ | |
import videojs from '../../src/js/video.js'; | ||
import TestHelpers from './test-helpers.js'; | ||
import * as Dom from '../../src/js/utils/dom.js'; | ||
import log from '../../src/js/utils/log.js'; | ||
import document from 'global/document'; | ||
|
||
QUnit.module('video.js'); | ||
|
@@ -45,6 +46,44 @@ QUnit.test('should return a video player instance', function(assert) { | |
player2.dispose(); | ||
}); | ||
|
||
QUnit.test('should log about already initalized players if options already passed', | ||
function(assert) { | ||
const origWarnLog = log.warn; | ||
const fixture = document.getElementById('qunit-fixture'); | ||
const warnLogs = []; | ||
|
||
log.warn = (args) => { | ||
warnLogs.push(args); | ||
}; | ||
|
||
fixture.innerHTML += '<video id="test_vid_id"></video>'; | ||
|
||
const player = videojs('test_vid_id', { techOrder: ['techFaker'] }); | ||
|
||
assert.ok(player, 'created player from tag'); | ||
assert.equal(player.id(), 'test_vid_id', 'player has the right ID'); | ||
assert.equal(warnLogs.length, 0, 'no warn logs'); | ||
|
||
const playerAgain = videojs('test_vid_id'); | ||
|
||
assert.equal(player, playerAgain, 'did not create a second player from same tag'); | ||
assert.equal(warnLogs.length, 0, 'no warn logs'); | ||
|
||
const playerAgainWithOptions = videojs('test_vid_id', { techOrder: ['techFaker'] }); | ||
|
||
assert.equal(player, | ||
playerAgainWithOptions, | ||
'did not create a second player from same tag'); | ||
assert.equal(warnLogs.length, 1, 'logged a warning'); | ||
assert.equal(warnLogs[0], | ||
'Player "test_vid_id" is already initialised. Options will not be applied.', | ||
'logged the right message'); | ||
|
||
log.warn = origWarnLog; | ||
|
||
player.dispose(); | ||
}); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
|
||
QUnit.test('should return a video player instance from el html5 tech', function(assert) { | ||
const fixture = document.getElementById('qunit-fixture'); | ||
|
||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we'd ultimately want this test to use
sinon.spy(log, 'warn')
instead and to use theTestHelpers.makePlayer()
function to create a mock player, but I don't think it should stop the PR from going in since there is time-sensitivity here.