test: a couple of minor fixes, tweak CI config, swap rollup replace plugin

.github/workflows/ci.yml

@@ -5,7 +5,7 @@ on: [push, pull_request]
 jobs:
   should-skip:
     continue-on-error: true
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     # Map a step output to a job output
     outputs:
       should-skip-job: ${{steps.skip-check.outputs.should_skip}}
@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-18.04]
     env:
       BROWSER_STACK_USERNAME: ${{secrets.BROWSER_STACK_USERNAME}}
       BROWSER_STACK_ACCESS_KEY: ${{secrets.BROWSER_STACK_ACCESS_KEY}}

package.json

@@ -87,6 +87,7 @@
     "@videojs/xhr": "2.5.1",
     "global": "4.3.2",
     "keycode": "^2.2.0",
+    "remove": "^0.1.5",
     "rollup-plugin-replace": "^2.2.0",
     "safe-json-parse": "4.0.0",
     "videojs-font": "3.2.0",
@@ -97,6 +98,7 @@
     "@babel/plugin-transform-object-assign": "^7.8.3",
     "@babel/plugin-transform-runtime": "^7.9.0",
     "@babel/preset-env": "^7.9.0",
+    "@rollup/plugin-replace": "^2.4.1",
     "access-sniff": "^3.2.0",
     "autoprefixer": "^9.6.0",
     "bestzip": "^2.1.4",
@@ -149,7 +151,7 @@
     "tui-jsdoc-template": "^1.2.2",
     "uglify-js": "^3.6.0",
     "unified": "^7.0.2",
-    "videojs-generate-karma-config": "^7.0.0",
+    "videojs-generate-karma-config": "^7.1.0",
     "videojs-languages": "^2.0.0",
     "videojs-standard": "^8.0.3",
     "webpack": "^1.15.0"

rollup.config.js

@@ -12,7 +12,7 @@ import pkg from './package.json';
 import multiEntry from 'rollup-plugin-multi-entry';
 import stub from 'rollup-plugin-stub';
 import isCI from 'is-ci';
-import replace from 'rollup-plugin-replace';
+import replace from '@rollup/plugin-replace';
 
 const compiledLicense = _.template(fs.readFileSync('./build/license-header.txt', 'utf8'));
 const bannerData = _.pick(pkg, ['version', 'copyright']);

test/unit/play.test.js

@@ -409,6 +409,8 @@ const mainModule = function(playReturnValue, middlewareTermination, subhooks) {
       });
     }
 
+    this.clock.tick(1000);
+
     this.finish(assert);
   });
 
@@ -429,9 +431,9 @@ const mainModule = function(playReturnValue, middlewareTermination, subhooks) {
         playerReady: true,
         playCalls: 1
       });
-    });
 
-    this.finish(assert);
+      this.finish(assert);
+    });
   });
 };
 

test/unit/videojs-integration.test.js

@@ -4,6 +4,8 @@ import window from 'global/window';
 import document from 'global/document';
 import * as Fn from '../../src/js/utils/fn';
 
+QUnit.module('videojs-integration');
+
 /**
  * This test is very important for dom-data memory checking
  * as it runs through a basic player lifecycle for real.
@@ -74,11 +76,14 @@ QUnit.test('create a real player and dispose', function(assert) {
     assert.ok(player.tech_, 'tech exists');
     assert.equal(player.textTracks().length, 1, 'should have one text track');
 
-    player.dispose();
+    // only dispose after a timeout
+    player.setTimeout(() => {
+      player.dispose();
 
-    Object.keys(old).forEach(function(k) {
-      Fn[`stub_${k}`](old[k]);
-    });
-    done();
+      Object.keys(old).forEach(function(k) {
+        Fn[`stub_${k}`](old[k]);
+      });
+      done();
+    }, 100);
   }, true);
 });