web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2024-11-28 08:58:46 +02:00
Code Releases Activity

test: fix tests (#3953)

Browse Source 
* Switch to es3 preset for babel so that it runs last. Plugins run before presets and presets run in reverse order. Also, we ran into a weird bug in babel that causes `default` not to be quoted in some cases (https://github.com/babel/babel/issues/4799) which we've worked around here.
* Restore the es-shims for tests and the ie8 fallback script.
* Do a null-check around `Player.players`.
* use more round fractions (like 0.5 and 1) to avoid rounding issues.
This commit is contained in:
Gary Katsevman 2017-01-19 11:17:46 -05:00 committed by GitHub
parent 2037e18235
commit 7bafcc2a55
8 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.babelrc
View File

@ -1,4 +1,4 @@
{
"presets": [ ["es2015", {"loose": true}] ],
"plugins": ["transform-es3-property-literals", "transform-es3-member-expression-literals", "inline-json"]
"presets": [ "es3", ["es2015", {"loose": true}] ],
"plugins": ["inline-json"]
}

3
package.json
View File

@ -49,10 +49,9 @@
"aliasify": "^2.1.0",
"babel-cli": "^6.11.4",
"babel-plugin-inline-json": "^1.1.1",
"babel-plugin-transform-es3-member-expression-literals": "^6.8.0",
"babel-plugin-transform-es3-property-literals": "^6.8.0",
"babel-plugin-transform-runtime": "^6.9.0",
"babel-preset-es2015": "^6.14.0",
"babel-preset-es3": "^1.0.1",
"babel-register": "^6.9.0",
"babelify": "^7.3.0",
"blanket": "^1.1.6",

2
src/js/component.js
View File

@ -1493,7 +1493,7 @@ class Component {
const Player = Component.getComponent('Player');
if (name === 'Player' && Player) {
if (name === 'Player' && Player && Player.players) {
const players = Player.players;
const playerNames = Object.keys(players);

4
test/globals-shim.js
View File

@ -1,6 +1,6 @@
/* eslint-env qunit */
// import 'es5-shim';
// import 'es6-shim';
import 'es5-shim';
import 'es6-shim';
import document from 'global/document';
import window from 'global/window';
import sinon from 'sinon';

2
test/index.html
View File

@ -9,7 +9,7 @@
<body>
<div id="qunit"></div>
<script src="../node_modules/qunitjs/qunit/qunit.js"></script>
<!-- <script src="../build/temp/ie8/videojs-ie8.js"></script> -->
<script src="../build/temp/ie8/videojs-ie8.js"></script>
<!-- Execute the bundled tests first -->
<script src="../build/temp/tests.js"></script>

1
test/karma.conf.js
View File

@ -10,6 +10,7 @@ module.exports = function(config) {
// Compling tests here
files: [
'../build/temp/video-js.css',
'../build/temp/ie8/videojs-ie8.min.js',
'../test/globals-shim.js',
'../test/unit/**/*.js',
'../build/temp/browserify.js',

4
test/unit/plugin-static.test.js
View File

@ -29,7 +29,7 @@ QUnit.test('registerPlugin() works with basic plugins', function(assert) {
assert.strictEqual(Plugin.registerPlugin('foo', foo), foo, 'the plugin is returned');
assert.strictEqual(Plugin.getPlugin('foo'), foo, 'the plugin can be retrieved');
assert.strictEqual(typeof Player.prototype.foo, 'function', 'the plugin has a wrapper function');
assert.strictEqual(Object.prototype.toString.call(Player.prototype.foo), '[object Function]', 'the plugin has a wrapper function');
assert.notStrictEqual(Player.prototype.foo, foo, 'the function on the player prototype is a wrapper');
Plugin.deregisterPlugin('foo');
@ -40,7 +40,7 @@ QUnit.test('registerPlugin() works with class-based plugins', function(assert) {
assert.strictEqual(Plugin.registerPlugin('foo', Foo), Foo, 'the plugin is returned');
assert.strictEqual(Plugin.getPlugin('foo'), Foo, 'the plugin can be retrieved');
assert.strictEqual(typeof Player.prototype.foo, 'function', 'the plugin has a factory function');
assert.strictEqual(Object.prototype.toString.call(Player.prototype.foo), '[object Function]', 'the plugin has a factory function');
assert.notStrictEqual(Player.prototype.foo, Foo, 'the function on the player prototype is a factory');
Plugin.deregisterPlugin('foo');

8
test/unit/tech/html5.test.js
View File

@ -108,11 +108,11 @@ QUnit.test('test volume', function(assert) {
tech.createEl();
tech.el().volume = 0.7;
assert.strictEqual(tech.volume(), 0.7, 'can be changed from the element');
tech.el().volume = 0.5;
assert.strictEqual(tech.volume(), 0.5, 'can be changed from the element');
tech.setVolume(0.2);
assert.strictEqual(tech.volume(), 0.2, 'can be changed from the API');
tech.setVolume(1);
assert.strictEqual(tech.volume(), 1, 'can be changed from the API');
});
QUnit.test('test defaultMuted', function(assert) {