Fix tests

bitmovin · May 16, 2024 · 92be405 · 92be405
1 parent c088ab6
commit 92be405
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 19 deletions.
diff --git a/spec/helper/MockHelper.ts b/spec/helper/MockHelper.ts
@@ -15,26 +15,28 @@ import {
   SubtitleEvent,
 } from 'bitmovin-player';
 import { ArrayUtils } from 'bitmovin-player-ui/dist/js/framework/arrayutils';
+import * as Conviva from '@convivainc/conviva-js-coresdk';
 
 declare const global: any;
 export namespace MockHelper {
-  export function mockConviva(): void {
-    global.Conviva = {};
-    global.Conviva.SystemInterface = jest.fn().mockImplementation();
-    global.Conviva.SystemSettings = jest.fn().mockImplementation();
-    global.Conviva.SystemSettings.LogLevel = {
+  export function createConvivaMock(): typeof Conviva {
+    const ConvivaMock: Record<string, any> = {};
+
+    ConvivaMock.SystemInterface = jest.fn().mockImplementation();
+    ConvivaMock.SystemSettings = jest.fn().mockImplementation();
+    ConvivaMock.SystemSettings.LogLevel = {
       WARNING: 'warning',
     };
-    global.Conviva.SystemFactory = jest.fn().mockImplementation();
-    global.Conviva.ClientSettings = jest.fn().mockImplementation();
-    global.Conviva.ContentMetadata = jest.fn().mockImplementation();
+    ConvivaMock.SystemFactory = jest.fn().mockImplementation();
+    ConvivaMock.ClientSettings = jest.fn().mockImplementation();
+    ConvivaMock.ContentMetadata = jest.fn().mockImplementation();
 
-    global.Conviva.ContentMetadata.StreamType = {
+    ConvivaMock.ContentMetadata.StreamType = {
       LIVE: 'live',
       VOD: 'vod',
       UNKNOWN: 'unknown',
     };
-    global.Conviva.Constants = {
+    ConvivaMock.Constants = {
       DeviceCategory: {
         WEB: 'WEB',
       },
@@ -130,15 +132,15 @@ export namespace MockHelper {
     const reportAppEvent = jest.fn();
 
     const release = jest.fn();
-    global.Conviva.Analytics = jest.fn().mockImplementation();
-    global.Conviva.Analytics = {
+    ConvivaMock.Analytics = jest.fn().mockImplementation();
+    ConvivaMock.Analytics = {
       init: jest.fn().mockImplementation(),
       release: jest.fn().mockImplementation(),
       setDeviceMetadata: jest.fn().mockImplementation(),
       updateContentMetadata: jest.fn().mockImplementation(),
     };
 
-    global.Conviva.Analytics.buildVideoAnalytics = jest.fn().mockImplementation(() => {
+    ConvivaMock.Analytics.buildVideoAnalytics = jest.fn().mockImplementation(() => {
       return {
         reportPlaybackRequested,
         reportPlaybackFailed,
@@ -156,6 +158,8 @@ export namespace MockHelper {
         release,
       };
     });
+
+    return ConvivaMock as typeof Conviva;
   }
 
   // Custom cast SDK implementation

diff --git a/spec/tests/ContentMetadata.spec.ts b/spec/tests/ContentMetadata.spec.ts
@@ -1,7 +1,12 @@
 import { PlayerType, StreamType, VRContentType } from 'bitmovin-player';
 import { ConvivaAnalytics } from '../../src/ts';
 import { MockHelper, TestingPlayerAPI } from '../helper/MockHelper';
+import * as Conviva from '@convivainc/conviva-js-coresdk';
 
+jest.mock('@convivainc/conviva-js-coresdk', () => {
+  const { MockHelper } = jest.requireActual('../helper/MockHelper');
+  return MockHelper.createConvivaMock();
+});
 jest.mock('../../src/ts/Html5Logging');
 
 describe('content metadata spec', () => {
@@ -10,8 +15,6 @@ describe('content metadata spec', () => {
   let convivaVideoAnalytics: Conviva.VideoAnalytics;
 
   beforeEach(() => {
-    MockHelper.mockConviva();
-
     playerMock = MockHelper.getPlayerMock();
     convivaVideoAnalytics = Conviva.Analytics.buildVideoAnalytics();
 

diff --git a/spec/tests/ExternalSessionManaging.spec.ts b/spec/tests/ExternalSessionManaging.spec.ts
@@ -1,6 +1,11 @@
 import { ConvivaAnalytics } from '../../src/ts';
 import { MockHelper, TestingPlayerAPI } from '../helper/MockHelper';
+import * as Conviva from '@convivainc/conviva-js-coresdk';
 
+jest.mock('@convivainc/conviva-js-coresdk', () => {
+  const { MockHelper } = jest.requireActual('../helper/MockHelper');
+  return MockHelper.createConvivaMock();
+});
 jest.mock('../../src/ts/Html5Logging');
 
 describe('externally session managing', () => {
@@ -9,8 +14,6 @@ describe('externally session managing', () => {
   let convivaVideoAnalyticsMock: Conviva.VideoAnalytics;
 
   beforeEach(() => {
-    MockHelper.mockConviva();
-
     playerMock = MockHelper.getPlayerMock();
 
     convivaVideoAnalyticsMock = Conviva.Analytics.buildVideoAnalytics();

diff --git a/spec/tests/PlayerEvents.spec.ts b/spec/tests/PlayerEvents.spec.ts
@@ -1,14 +1,18 @@
 import { MockHelper, TestingPlayerAPI } from '../helper/MockHelper';
 import { ConvivaAnalytics } from '../../src/ts';
+import * as Conviva from '@convivainc/conviva-js-coresdk';
+
+jest.mock('@convivainc/conviva-js-coresdk', () => {
+  const { MockHelper } = jest.requireActual('../helper/MockHelper');
+  return MockHelper.createConvivaMock();
+});
 
 describe('player event tests', () => {
   let convivaAnalytics: ConvivaAnalytics;
   let playerMock: TestingPlayerAPI;
   let convivaVideoAnalytics: Conviva.VideoAnalytics;
 
   beforeEach(() => {
-    MockHelper.mockConviva();
-
     playerMock = MockHelper.getPlayerMock();
     convivaVideoAnalytics = Conviva.Analytics.buildVideoAnalytics();