Skip to content
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.

Sign up for GitHub

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

test: update tests to use qunit 2 assert format #4753

Merged
merged 3 commits into from
Nov 16, 2017
Merged

test: update tests to use qunit 2 assert format #4753

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9825b0d
test: update qunitjs to version 2, package now called qunit
brandonocasey Nov 16, 2017
8f09d19
revert qunit update
brandonocasey Nov 16, 2017
fa498a9
revert index.html
brandonocasey Nov 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions test/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
<head>
<meta charset="utf-8">
<title>VideoJS Tests</title>
<link rel="stylesheet" href="../node_modules/qunitjs/qunit/qunit.css">
<link rel="stylesheet" href="../node_modules/qunit/qunit/qunit.css">
<link rel="stylesheet" href="../build/temp/video-js.min.css">
</head>
<body>
<div id="qunit"></div>
<script src="../node_modules/qunitjs/qunit/qunit.js"></script>
<script src="../node_modules/qunit/qunit/qunit.js"></script>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should these urls be reverted as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes

<script src="../build/temp/ie8/videojs-ie8.js"></script>

<!-- Execute the bundled tests first -->
Expand Down
12 changes: 6 additions & 6 deletions test/unit/clickable-component.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ QUnit.test('should be enabled/disabled', function(assert) {
player.dispose();
});

QUnit.test('handleClick should not be triggered when disabled', function() {
QUnit.test('handleClick should not be triggered when disabled', function(assert) {
let clicks = 0;

class TestClickableComponent extends ClickableComponent {
Expand All @@ -56,23 +56,23 @@ QUnit.test('handleClick should not be triggered when disabled', function() {

// 1st click
Events.trigger(el, 'click');
QUnit.equal(clicks, 1, 'click on enabled ClickableComponent is handled');
assert.equal(clicks, 1, 'click on enabled ClickableComponent is handled');

testClickableComponent.disable();
// No click should happen.
Events.trigger(el, 'click');
QUnit.equal(clicks, 1, 'click on disabled ClickableComponent is not handled');
assert.equal(clicks, 1, 'click on disabled ClickableComponent is not handled');

testClickableComponent.enable();
// 2nd Click
Events.trigger(el, 'click');
QUnit.equal(clicks, 2, 'click on re-enabled ClickableComponent is handled');
assert.equal(clicks, 2, 'click on re-enabled ClickableComponent is handled');

testClickableComponent.dispose();
player.dispose();
});

QUnit.test('handleClick should not be triggered more than once when enabled', function() {
QUnit.test('handleClick should not be triggered more than once when enabled', function(assert) {
let clicks = 0;

class TestClickableComponent extends ClickableComponent {
Expand All @@ -88,7 +88,7 @@ QUnit.test('handleClick should not be triggered more than once when enabled', fu
testClickableComponent.enable();
// Click should still be handled just once
Events.trigger(el, 'click');
QUnit.equal(clicks, 1, 'no additional click handler when already enabled ClickableComponent has been enabled again');
assert.equal(clicks, 1, 'no additional click handler when already enabled ClickableComponent has been enabled again');

testClickableComponent.dispose();
player.dispose();
Expand Down
6 changes: 3 additions & 3 deletions test/unit/controls.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,16 +90,16 @@ QUnit.test('should hide playback rate control if it\'s not supported', function(
player.dispose();
});

QUnit.test('Fullscreen control text should be correct when fullscreenchange is triggered', function() {
QUnit.test('Fullscreen control text should be correct when fullscreenchange is triggered', function(assert) {
const player = TestHelpers.makePlayer();
const fullscreentoggle = new FullscreenToggle(player);

player.isFullscreen(true);
player.trigger('fullscreenchange');
QUnit.equal(fullscreentoggle.controlText(), 'Non-Fullscreen', 'Control Text is correct while switching to fullscreen mode');
assert.equal(fullscreentoggle.controlText(), 'Non-Fullscreen', 'Control Text is correct while switching to fullscreen mode');
player.isFullscreen(false);
player.trigger('fullscreenchange');
QUnit.equal(fullscreentoggle.controlText(), 'Fullscreen', 'Control Text is correct while switching back to normal mode');
assert.equal(fullscreentoggle.controlText(), 'Fullscreen', 'Control Text is correct while switching back to normal mode');
player.dispose();
});

Expand Down
4 changes: 2 additions & 2 deletions test/unit/tech/html5.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,7 +686,7 @@ QUnit.test('Html5#reset calls Html5.resetMediaElement when called', function(ass
Html5.resetMediaElement = oldResetMedia;
});

test('When Android Chrome reports Infinity duration with currentTime 0, return NaN', function() {
QUnit.test('When Android Chrome reports Infinity duration with currentTime 0, return NaN', function(assert) {
const oldIsAndroid = browser.IS_ANDROID;
const oldIsChrome = browser.IS_CHROME;
const oldEl = tech.el_;
Expand All @@ -698,7 +698,7 @@ test('When Android Chrome reports Infinity duration with currentTime 0, return N
duration: Infinity,
currentTime: 0
};
ok(Number.isNaN(tech.duration()), 'returned NaN with currentTime 0');
assert.ok(Number.isNaN(tech.duration()), 'returned NaN with currentTime 0');

browser.IS_ANDROID = oldIsAndroid;
browser.IS_CHROME = oldIsChrome;
Expand Down
42 changes: 21 additions & 21 deletions test/unit/tracks/text-track-controls.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,29 +324,29 @@ const chaptersTrack = {
label: 'Test Chapters'
};

test('chapters should not be displayed when text tracks list is empty', function() {
QUnit.test('chapters should not be displayed when text tracks list is empty', function(assert) {
const player = TestHelpers.makePlayer();

ok(player.controlBar.chaptersButton.hasClass('vjs-hidden'), 'control is not displayed');
equal(player.textTracks().length, 0, 'textTracks is empty');
assert.ok(player.controlBar.chaptersButton.hasClass('vjs-hidden'), 'control is not displayed');
assert.equal(player.textTracks().length, 0, 'textTracks is empty');

player.dispose();
});

test('chapters should not be displayed when there is chapters track but no cues', function() {
QUnit.test('chapters should not be displayed when there is chapters track but no cues', function(assert) {
const player = TestHelpers.makePlayer({
tracks: [chaptersTrack]
});

this.clock.tick(1000);

ok(player.controlBar.chaptersButton.hasClass('vjs-hidden'), 'chapters menu is not displayed');
equal(player.textTracks().length, 1, 'textTracks contains one item');
assert.ok(player.controlBar.chaptersButton.hasClass('vjs-hidden'), 'chapters menu is not displayed');
assert.equal(player.textTracks().length, 1, 'textTracks contains one item');

player.dispose();
});

test('chapters should be displayed when cues added to initial track and button updated', function() {
QUnit.test('chapters should be displayed when cues added to initial track and button updated', function(assert) {
const player = TestHelpers.makePlayer({
tracks: [chaptersTrack]
});
Expand All @@ -365,20 +365,20 @@ test('chapters should be displayed when cues added to initial track and button u
endTime: 4,
text: 'Chapter 2'
});
equal(chapters.cues.length, 2);
assert.equal(chapters.cues.length, 2);

player.controlBar.chaptersButton.update();

ok(!player.controlBar.chaptersButton.hasClass('vjs-hidden'), 'chapters menu is displayed');
assert.ok(!player.controlBar.chaptersButton.hasClass('vjs-hidden'), 'chapters menu is displayed');

const menuItems = player.controlBar.chaptersButton.items;

equal(menuItems.length, 2, 'menu contains two item');
assert.equal(menuItems.length, 2, 'menu contains two item');

player.dispose();
});

test('chapters should be displayed when a track and its cures added and button updated', function() {
QUnit.test('chapters should be displayed when a track and its cures added and button updated', function(assert) {
const player = TestHelpers.makePlayer();

this.clock.tick(1000);
Expand All @@ -395,20 +395,20 @@ test('chapters should be displayed when a track and its cures added and button u
endTime: 4,
text: 'Chapter 2'
});
equal(chapters.cues.length, 2);
assert.equal(chapters.cues.length, 2);

player.controlBar.chaptersButton.update();

ok(!player.controlBar.chaptersButton.hasClass('vjs-hidden'), 'chapters menu is displayed');
assert.ok(!player.controlBar.chaptersButton.hasClass('vjs-hidden'), 'chapters menu is displayed');

const menuItems = player.controlBar.chaptersButton.items;

equal(menuItems.length, 2, 'menu contains two item');
assert.equal(menuItems.length, 2, 'menu contains two item');

player.dispose();
});

test('chapters menu should use track label as menu title', function() {
QUnit.test('chapters menu should use track label as menu title', function(assert) {
const player = TestHelpers.makePlayer({
tracks: [chaptersTrack]
});
Expand All @@ -427,20 +427,20 @@ test('chapters menu should use track label as menu title', function() {
endTime: 4,
text: 'Chapter 2'
});
equal(chapters.cues.length, 2);
assert.equal(chapters.cues.length, 2);

player.controlBar.chaptersButton.update();

const menu = player.controlBar.chaptersButton.menu;
const titleEl = menu.contentEl().firstChild;
const menuTitle = titleEl.textContent || titleEl.innerText;

equal(menuTitle, 'Test Chapters', 'menu gets track label as title');
assert.equal(menuTitle, 'Test Chapters', 'menu gets track label as title');

player.dispose();
});

test('chapters should be displayed when remote track added and load event fired', function() {
QUnit.test('chapters should be displayed when remote track added and load event fired', function(assert) {
const player = TestHelpers.makePlayer();

this.clock.tick(1000);
Expand All @@ -458,7 +458,7 @@ test('chapters should be displayed when remote track added and load event fired'
text: 'Chapter 2'
});

equal(chaptersEl.track.cues.length, 2);
assert.equal(chaptersEl.track.cues.length, 2);

// Anywhere where we support using native text tracks, we can trigger a custom DOM event.
// On IE8 and other places where we have emulated tracks, either we cannot trigger custom
Expand All @@ -470,11 +470,11 @@ test('chapters should be displayed when remote track added and load event fired'
chaptersEl.trigger('load');
}

ok(!player.controlBar.chaptersButton.hasClass('vjs-hidden'), 'chapters menu is displayed');
assert.ok(!player.controlBar.chaptersButton.hasClass('vjs-hidden'), 'chapters menu is displayed');

const menuItems = player.controlBar.chaptersButton.items;

equal(menuItems.length, 2, 'menu contains two item');
assert.equal(menuItems.length, 2, 'menu contains two item');

player.dispose();
});