Merge pull request #136 from MailOnline/next-release

Next release
MailOnline · Jan 25, 2019 · cee5f6e · cee5f6e
2 parents c2a7c42 + c18922a
commit cee5f6e
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 5 deletions.
diff --git a/src/runner/helpers/__tests__/startVideoAd.spec.js b/src/runner/helpers/__tests__/startVideoAd.spec.js
@@ -18,6 +18,14 @@ import VpaidAdUnit from '../../../adUnit/VpaidAdUnit';
 import canPlay from '../../../adUnit/helpers/media/canPlay';
 import VideoAdContainer from '../../../adContainer/VideoAdContainer';
 import startVideoAd from '../startVideoAd';
+import {
+  start,
+  closeLinear
+} from '../../../tracker/linearEvents';
+import {
+  adStopped,
+  adUserClose
+} from '../../../adUnit/helpers/vpaid/api';
 
 jest.mock('../../../adUnit/createVideoAdUnit');
 jest.mock('../../../adUnit/helpers/media/canPlay');
@@ -170,14 +178,38 @@ describe('startVideoAd', () => {
     expect(startVideoAd(vastAdChain, videoAdContainer, options)).rejects.toBe(adUnitError);
   });
 
-  test('must cancel the ad unit if there is an error starting the VPAID ad unit', async () => {
+  [
+    adUserClose,
+    adStopped,
+    closeLinear
+  ].forEach((event) => {
+    test(`must cancel the ad unit start on '${event}' event`, async () => {
+      expect.assertions(1);
+      const adUnit = createAdUnitMock(vastAdChain, videoAdContainer, options);
+
+      createVideoAdUnit.mockImplementation(() => {
+        adUnit.start = () => {
+          adUnit.emit(event);
+        };
+
+        return adUnit;
+      });
+
+      try {
+        await startVideoAd(vpaidAdChain, videoAdContainer, options);
+      } catch (error) {
+        expect(error.message).toBe(`Ad unit start rejected due to event '${event}'`);
+      }
+    });
+  });
+
+  test('must onAdReady event if the ad unit gets canceled', async () => {
     expect.assertions(5);
     canPlay.mockReturnValue(false);
     const adUnitError = new Error('adUnit error');
     const adUnit = createVPAIDAdUnitMock(vpaidAdChain, videoAdContainer, options);
 
     createVideoAdUnit.mockImplementation(() => {
-    // eslint-disable-next-line promise/always-return, promise/always-return, promise/catch-or-return, promise/prefer-await-to-then
       adUnit.start = () => {
         adUnit.__simulateError(adUnitError);
       };
@@ -206,7 +238,7 @@ describe('startVideoAd', () => {
     createVideoAdUnit.mockImplementation(() => {
     // eslint-disable-next-line promise/always-return, promise/always-return, promise/catch-or-return, promise/prefer-await-to-then
       adUnit.start = () => {
-        adUnit.emit('start');
+        adUnit.emit(start);
       };
 
       return adUnit;
@@ -256,7 +288,7 @@ describe('startVideoAd', () => {
         // eslint-disable-next-line promise/always-return, promise/always-return, promise/catch-or-return, promise/prefer-await-to-then
 
           adUnit.start = () => {
-            adUnit.emit('start');
+            adUnit.emit(start);
           };
 
           return adUnit;

diff --git a/src/runner/helpers/startVideoAd.js b/src/runner/helpers/startVideoAd.js
@@ -2,6 +2,14 @@ import createVideoAdUnit from '../../adUnit/createVideoAdUnit';
 import VideoAdContainer from '../../adContainer/VideoAdContainer';
 import {getInteractiveFiles, getMediaFiles} from '../../vastSelectors';
 import canPlay from '../../adUnit/helpers/media/canPlay';
+import {
+  start,
+  closeLinear
+} from '../../tracker/linearEvents';
+import {
+  adStopped,
+  adUserClose
+} from '../../adUnit/helpers/vpaid/api';
 
 const validate = (vastChain, videoAdContainer) => {
   if (!Array.isArray(vastChain) || vastChain.length === 0) {
@@ -26,8 +34,14 @@ const hasVastCreative = (ad, videoElement) => {
 };
 
 const startAdUnit = (adUnit, {onAdReady}) => new Promise((resolve, reject) => {
+  const createRejectHandler = (event) => () =>
+    reject(new Error(`Ad unit start rejected due to event '${event}'`));
+
   adUnit.onError(reject);
-  adUnit.on('start', () => resolve(adUnit));
+  adUnit.on(start, () => resolve(adUnit));
+  adUnit.on(adUserClose, createRejectHandler(adUserClose));
+  adUnit.on(closeLinear, createRejectHandler(closeLinear));
+  adUnit.on(adStopped, createRejectHandler(adStopped));
 
   onAdReady(adUnit);
   adUnit.start();