Skip to content
This repository has been archived by the owner on Jan 12, 2019. It is now read-only.

Add nvmrc and update travis' chrome reference #1322

Merged
merged 43 commits into from
Jan 25, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
6f7e6b0
Add nvmrc and update travis' chrome reference
gesinger Jan 19, 2018
033f0f5
Set sudo to required in travis
gesinger Jan 19, 2018
b0b4706
Change Karma travisChrome to ChromeHeadless
gesinger Jan 19, 2018
cdc8b90
Update karma-chrome-launcher to ^2.2.0
gesinger Jan 19, 2018
7921568
Update karma to ^1.7.1 and remove firefox from travis configuration
gesinger Jan 19, 2018
8167017
enable node_modules caching on travis
thijstriemstra Sep 17, 2017
9b6f84e
Add assertion and clock tick to test for removing event handlers on d…
gesinger Jan 22, 2018
f4ede61
Remove clock tick from event handler dispose test
gesinger Jan 22, 2018
f309368
Update videojs-contrib-quality-levels to ^2.0.4
gesinger Jan 22, 2018
53027c5
Allow cleanup for subtitle loader dispose tests
gesinger Jan 22, 2018
66d2950
Don't reuse dispose after subtitle loader dispose tests
gesinger Jan 22, 2018
8aafbcb
Move order of player dispose in playback watcher tests
gesinger Jan 22, 2018
242886a
Tick the clock after playback watcher tests
gesinger Jan 22, 2018
f70fd03
Tick the clock after a seek in a playback watcher test
gesinger Jan 22, 2018
2c0cc3d
Try not using I-Frame in karma config
gesinger Jan 23, 2018
9777233
Revert karma iframe setting and try using only VJS 6 for Travis
gesinger Jan 23, 2018
db4c2e1
Try deprecated group for travis config
gesinger Jan 23, 2018
4ed55b4
Remove deprecated group from travis config
gesinger Jan 23, 2018
0d3c5cb
Use ChromeHeadless locally, Chrome on Travis
gesinger Jan 23, 2018
440c8fc
Try adding back in old Chrome travis config before scripts
gesinger Jan 23, 2018
3c5c716
Try switching back to apt Chrome and disable sudo
gesinger Jan 23, 2018
c19737d
Remove travis node_module cache
gesinger Jan 23, 2018
95b1a68
Roll back karma-chrome-launcher to ^0.2.0
gesinger Jan 23, 2018
2205387
Roll back karma to ^0.13.0
gesinger Jan 23, 2018
83f7888
Return VJS 5 and node_js specifier in travis config
gesinger Jan 23, 2018
d556d13
Return travis config to its original state and remove .nvmrc
gesinger Jan 23, 2018
5bc6460
Fix firefox reference in travis config
gesinger Jan 23, 2018
6ac3e76
Set video.js 6 to a known working version for travis tests
gesinger Jan 23, 2018
d659e8e
Set travis version of VJS 6 to 6.2.5
gesinger Jan 23, 2018
401add7
Add browserDisconnectTolerance of 3 to karma config
gesinger Jan 23, 2018
33c7aa3
Return ChromeHeadless to travis config
gesinger Jan 23, 2018
2364d71
Update video.js to 6.4.0 to test on travis
gesinger Jan 23, 2018
f281baa
Update video.js to 6.6.0 to test on travis
gesinger Jan 23, 2018
755d477
Update video.js to 6.5.1 to test on travis
gesinger Jan 23, 2018
4760a83
Update video.js to 6.5.0 to test on travis
gesinger Jan 23, 2018
e81ea7e
Update video.js to 6.4.0 to test on travis
gesinger Jan 23, 2018
87d2c27
Revert some changes to tests for travis testing
gesinger Jan 23, 2018
06c1bfe
Update video.js to 6.5.0 to test on travis and update sinon patch ver…
gesinger Jan 23, 2018
edfc2d3
Fix test for event handler cleanup on dispose by calling event handli…
gesinger Jan 24, 2018
944df17
Revert video.js version and karma browserDisconnectTolerance
gesinger Jan 24, 2018
500b2d3
Add .nvmrc and remove node_js section from travis config
gesinger Jan 24, 2018
850ae1c
Rename travisChrome to ChromeHeadlessNoSandbox
gesinger Jan 24, 2018
c0140b9
enable node_modules caching on travis
thijstriemstra Sep 17, 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
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lts/*
17 changes: 5 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
sudo: false
sudo: required
dist: trusty
language: node_js
node_js:
- 'node'
cache:
directories:
- node_modules
notifications:
hipchat:
rooms:
Expand All @@ -14,16 +15,8 @@ notifications:
before_script:
# always install the appropriate version of video.js for the environment
- npm i "video.js@$VJS";
- export CHROME_BIN=/usr/bin/google-chrome
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
env:
- VJS=5
- VJS=6
addons:
firefox: latest
apt:
sources:
- google-chrome
packages:
- google-chrome-stable
chrome: stable
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,9 @@
"isparta": "^4.0.0",
"istanbul": "^0.4.5",
"jsdoc": "^3.4.0",
"karma": "^0.13.0",
"karma": "^1.7.1",
"karma-browserify": "^4.4.0",
"karma-chrome-launcher": "^0.2.0",
"karma-chrome-launcher": "^2.2.0",
"karma-coverage": "^1.1.1",
"karma-detect-browsers": "^2.0.0",
"karma-firefox-launcher": "^0.1.0",
Expand All @@ -132,9 +132,9 @@
"qunitjs": "^2.0.1",
"serve-static": "^1.10.0",
"shelljs": "^0.5.3",
"sinon": "1.10.2",
"sinon": "1.10.3",
"uglify-js": "^2.5.0",
"videojs-contrib-quality-levels": "^2.0.2",
"videojs-contrib-quality-levels": "^2.0.4",
"videojs-flash": "^2.0.0",
"videojs-standard": "^4.0.3",
"videojs-swf": "^5.2.0",
Expand Down
6 changes: 3 additions & 3 deletions test/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ module.exports = function(config) {
};

if (process.env.TRAVIS) {
config.browsers = ['travisChrome'];
config.browsers = ['ChromeHeadlessNoSandbox'];
}

// If no browsers are specified, we enable `karma-detect-browsers`
Expand Down Expand Up @@ -67,8 +67,8 @@ module.exports = function(config) {
}
},
customLaunchers: {
travisChrome: {
base: 'Chrome',
ChromeHeadlessNoSandbox: {
base: 'ChromeHeadless',
flags: ['--no-sandbox']
}
},
Expand Down
16 changes: 12 additions & 4 deletions test/videojs-contrib-hls.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -1926,15 +1926,21 @@ QUnit.test('remove event handlers on dispose', function(assert) {
let unscoped = 0;

player = createPlayer();
player.on = function(owner) {
if (typeof owner !== 'object') {

const origPlayerOn = player.on.bind(player);
const origPlayerOff = player.off.bind(player);

player.on = function(...args) {
if (typeof args[0] !== 'object') {
unscoped++;
}
origPlayerOn(...args);
};
player.off = function(owner) {
if (typeof owner !== 'object') {
player.off = function(...args) {
if (typeof args[0] !== 'object') {
unscoped--;
}
origPlayerOff(...args);
};
player.src({
src: 'manifest/master.m3u8',
Expand All @@ -1948,6 +1954,8 @@ QUnit.test('remove event handlers on dispose', function(assert) {
this.standardXHRResponse(this.requests[0]);
this.standardXHRResponse(this.requests[1]);

assert.ok(unscoped > 0, 'has unscoped handlers');

player.dispose();

assert.ok(unscoped <= 0, 'no unscoped handlers');
Expand Down