Handle dispose (#407)

* WIP * wip * skip test that fails due to fix * tests
videojs · Jul 31, 2018 · f8fb25f · f8fb25f
1 parent 6d5ff0f
commit f8fb25f
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 9 deletions.
diff --git a/package-lock.json.3120487608 b/package-lock.json.3120487608
diff --git a/src/plugin.js b/src/plugin.js
@@ -232,13 +232,14 @@ const contribAdsPlugin = function(options) {
     'play', 'playing', 'ended',
     'adsready', 'adscanceled', 'adskip', 'adserror', 'adtimeout',
     'ads-ad-started',
-    'contentchanged', 'contentresumed', 'readyforpostroll',
+    'contentchanged', 'dispose', 'contentresumed', 'readyforpostroll',
     'nopreroll', 'nopostroll'], (e) => {
     player.ads._state.handleEvent(e.type);
   });
 
   // Clear timeouts and handlers when player is disposed
   player.on('dispose', function() {
+    player.ads.reset();
     player.textTracks().removeEventListener('change', textTrackChangeHandler);
   });
 

diff --git a/src/states/BeforePreroll.js b/src/states/BeforePreroll.js
@@ -83,10 +83,15 @@ export default class BeforePreroll extends ContentState {
     this.shouldResumeToContent = true;
   }
 
-  /*
-   * Content source change before preroll is currently not handled. When
-   * developed, this is where to start.
-   */
-  onContentChanged() {}
+  onContentChanged() {
+    this.init(this.player);
+
+    // TODO: Handle case where player does not play on content change
+    this.onPlay(this.player);
+  }
+
+  onDispose() {
+    this.init(this.player);
+  }
 
 }
diff --git a/src/states/abstract/State.js b/src/states/abstract/State.js
@@ -54,6 +54,7 @@ export default class State {
   onAdTimeout() {}
   onAdStarted() {}
   onContentChanged() {}
+  onDispose() {}
   onContentResumed() {}
   onReadyForPostroll() {
     videojs.log.warn('Unexpected readyforpostroll event');
@@ -123,6 +124,8 @@ export default class State {
       this.onAdStarted(player);
     } else if (type === 'contentchanged') {
       this.onContentChanged(player);
+    } else if (type === 'dispose') {
+      this.onDispose(player);
     } else if (type === 'contentresumed') {
       this.onContentResumed(player);
     } else if (type === 'readyforpostroll') {

diff --git a/test/unit/states/test.BeforePreroll.js b/test/unit/states/test.BeforePreroll.js
@@ -94,10 +94,18 @@ QUnit.test('skips the preroll', function(assert) {
   assert.equal(this.transitionArg2, true);
 });
 
-QUnit.test('does nothing on content change', function(assert) {
-  this.beforePreroll.init(this.player);
+QUnit.test('handles content change', function(assert) {
+  sinon.spy(this.beforePreroll, "init");
+  sinon.spy(this.beforePreroll, "onPlay");
   this.beforePreroll.onContentChanged(this.player);
-  assert.equal(this.newState, undefined);
+  assert.equal(this.beforePreroll.init.calledOnce, true);
+  assert.equal(this.beforePreroll.onPlay.calledOnce, true);
+});
+
+QUnit.test('handles dispose', function(assert) {
+  sinon.spy(this.beforePreroll, "init");
+  this.beforePreroll.onDispose(this.player);
+  assert.equal(this.beforePreroll.init.calledOnce, true);
 });
 
 QUnit.test('sets _shouldBlockPlay to true', function(assert) {