rx-player 4.0.0-beta.2 → 4.0.0-beta.3

package/src/core/decrypt/__tests__/__global__/init_data.test.ts

@@ -63,7 +63,7 @@ describe("core - decrypt - global tests - init data", () => {
       const initData = new Uint8Array([54, 55, 75]);
 
       // == test ==
-      const { ContentDecryptorState } = jest.requireActual("../../content_decryptor");
+      const { ContentDecryptorState } = jest.requireActual("../../types");
       const ContentDecryptor = jest.requireActual("../../content_decryptor").default;
       const contentDecryptor = new ContentDecryptor(videoElt, ksConfig);
       contentDecryptor.addEventListener("stateChange", (newState: any) => {
@@ -109,7 +109,7 @@ describe("core - decrypt - global tests - init data", () => {
       const initData = new Uint8Array([54, 55, 75]);
 
       // == test ==
-      const { ContentDecryptorState } = jest.requireActual("../../content_decryptor");
+      const { ContentDecryptorState } = jest.requireActual("../../types");
       const ContentDecryptor = jest.requireActual("../../content_decryptor").default;
       const contentDecryptor = new ContentDecryptor(videoElt, ksConfig);
       contentDecryptor.addEventListener("stateChange", (newState: any) => {
@@ -173,7 +173,7 @@ describe("core - decrypt - global tests - init data", () => {
                           new Uint8Array([87, 77]) ];
 
       // == test ==
-      const { ContentDecryptorState } = jest.requireActual("../../content_decryptor");
+      const { ContentDecryptorState } = jest.requireActual("../../types");
       const ContentDecryptor = jest.requireActual("../../content_decryptor").default;
       const contentDecryptor = new ContentDecryptor(videoElt, ksConfig);
       contentDecryptor.addEventListener("stateChange", (newState: any) => {
@@ -260,7 +260,7 @@ describe("core - decrypt - global tests - init data", () => {
       const initData = new Uint8Array([54, 55, 75]);
 
       // == test ==
-      const { ContentDecryptorState } = jest.requireActual("../../content_decryptor");
+      const { ContentDecryptorState } = jest.requireActual("../../types");
       const ContentDecryptor = jest.requireActual("../../content_decryptor").default;
       const contentDecryptor = new ContentDecryptor(videoElt, ksConfig);
       contentDecryptor.addEventListener("stateChange", (newState: any) => {
@@ -312,7 +312,9 @@ describe("core - decrypt - global tests - init data", () => {
   /* eslint-enable max-len */
     return new Promise<void>((res, rej) => {
       // == mocks ==
-      const { mockGenerateKeyRequest, eventTriggers, mockGetInitData } = mockCompat();
+      const { mockGenerateKeyRequest,
+              eventTriggers,
+              mockGetInitData } = mockCompat();
       const mediaKeySession = new MediaKeySessionImpl();
       const mockCreateSession = jest.spyOn(MediaKeysImpl.prototype, "createSession")
         .mockReturnValue(mediaKeySession);
@@ -321,7 +323,7 @@ describe("core - decrypt - global tests - init data", () => {
       const initData = new Uint8Array([54, 55, 75]);
 
       // == test ==
-      const { ContentDecryptorState } = jest.requireActual("../../content_decryptor");
+      const { ContentDecryptorState } = jest.requireActual("../../types");
       const ContentDecryptor = jest.requireActual("../../content_decryptor").default;
       const contentDecryptor = new ContentDecryptor(videoElt, ksConfig);
       contentDecryptor.addEventListener("stateChange", (newState: any) => {
@@ -361,7 +363,9 @@ describe("core - decrypt - global tests - init data", () => {
   it("should ignore init data already received through the browser", () => {
     return new Promise<void>((res, rej) => {
       // == mocks ==
-      const { mockGenerateKeyRequest, eventTriggers, mockGetInitData } = mockCompat();
+      const { mockGenerateKeyRequest,
+              eventTriggers,
+              mockGetInitData } = mockCompat();
       const mediaKeySession = new MediaKeySessionImpl();
       const mockCreateSession = jest.spyOn(MediaKeysImpl.prototype, "createSession")
         .mockReturnValue(mediaKeySession);
@@ -370,7 +374,7 @@ describe("core - decrypt - global tests - init data", () => {
       const initData = new Uint8Array([54, 55, 75]);
 
       // == test ==
-      const { ContentDecryptorState } = jest.requireActual("../../content_decryptor");
+      const { ContentDecryptorState } = jest.requireActual("../../types");
       const ContentDecryptor = jest.requireActual("../../content_decryptor").default;
       const contentDecryptor = new ContentDecryptor(videoElt, ksConfig);
       contentDecryptor.addEventListener("stateChange", (newState: any) => {
@@ -421,7 +425,9 @@ describe("core - decrypt - global tests - init data", () => {
   /* eslint-enable max-len */
     return new Promise<void>((res, rej) => {
       // == mocks ==
-      const { mockGenerateKeyRequest, eventTriggers, mockGetInitData } = mockCompat();
+      const { mockGenerateKeyRequest,
+              eventTriggers,
+              mockGetInitData } = mockCompat();
       const mediaKeySessions = [ new MediaKeySessionImpl(),
                                  new MediaKeySessionImpl(),
                                  new MediaKeySessionImpl() ];
@@ -443,7 +449,7 @@ describe("core - decrypt - global tests - init data", () => {
                                  values: [ { systemId: "15", data: initDatas[2] } ] } ];
 
       // == test ==
-      const { ContentDecryptorState } = jest.requireActual("../../content_decryptor");
+      const { ContentDecryptorState } = jest.requireActual("../../types");
       const ContentDecryptor = jest.requireActual("../../content_decryptor").default;
       const contentDecryptor = new ContentDecryptor(videoElt, ksConfig);
       contentDecryptor.addEventListener("stateChange", (newState: any) => {
@@ -515,7 +521,9 @@ describe("core - decrypt - global tests - init data", () => {
   /* eslint-enable max-len */
     return new Promise<void>((res, rej) => {
       // == mocks ==
-      const { mockGenerateKeyRequest, eventTriggers, mockGetInitData } = mockCompat();
+      const { mockGenerateKeyRequest,
+              eventTriggers,
+              mockGetInitData } = mockCompat();
       const mediaKeySessions = [ new MediaKeySessionImpl(),
                                  new MediaKeySessionImpl() ];
       let createSessionCallIdx = 0;
@@ -531,7 +539,7 @@ describe("core - decrypt - global tests - init data", () => {
                                  values: [ { systemId: "15", data: initData } ] } ];
 
       // == test ==
-      const { ContentDecryptorState } = jest.requireActual("../../content_decryptor");
+      const { ContentDecryptorState } = jest.requireActual("../../types");
       const ContentDecryptor = jest.requireActual("../../content_decryptor").default;
       const contentDecryptor = new ContentDecryptor(videoElt, ksConfig);
       contentDecryptor.addEventListener("stateChange", (newState: any) => {
@@ -579,7 +587,9 @@ describe("core - decrypt - global tests - init data", () => {
   it("should consider sent event through arguments and received events through the browser the same way", () => {
     return new Promise<void>((res, rej) => {
       // == mocks ==
-      const { mockGenerateKeyRequest, eventTriggers, mockGetInitData } = mockCompat();
+      const { mockGenerateKeyRequest,
+              eventTriggers,
+              mockGetInitData } = mockCompat();
       const mediaKeySessions = [ new MediaKeySessionImpl(),
                                  new MediaKeySessionImpl(),
                                  new MediaKeySessionImpl() ];
@@ -601,7 +611,7 @@ describe("core - decrypt - global tests - init data", () => {
                                  values: [ { systemId: "15", data: initDatas[2] } ] } ];
 
       // == test ==
-      const { ContentDecryptorState } = jest.requireActual("../../content_decryptor");
+      const { ContentDecryptorState } = jest.requireActual("../../types");
       const ContentDecryptor = jest.requireActual("../../content_decryptor").default;
       const contentDecryptor = new ContentDecryptor(videoElt, ksConfig);
       contentDecryptor.addEventListener("stateChange", (newState: any) => {

package/src/core/decrypt/__tests__/__global__/media_key_system_access.test.ts

@@ -24,7 +24,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable no-restricted-properties */
 
-import { ICustomMediaKeySystemAccess } from "../../../../compat";
+import { ICustomMediaKeySystemAccess } from "../../../../compat/eme";
 import {
   defaultKSConfig,
   defaultPRRecommendationKSConfig,
@@ -48,7 +48,7 @@ export function requestMediaKeySystemAccessNoMediaKeys(
 }
 
 const incompatibleMKSAErrorMessage =
-  "EncryptedMediaError (INCOMPATIBLE_KEYSYSTEMS) No key system compatible " +
+  "INCOMPATIBLE_KEYSYSTEMS: No key system compatible " +
   "with your wanted configuration has been found in the current browser.";
 
 /**
@@ -94,7 +94,9 @@ describe("core - decrypt - global tests - media key system access", () => {
 
   it("should throw if given a single incompatible keySystemsConfigs", async () => {
     const mockRequestMediaKeySystemAccess = jest.fn(() => Promise.reject("nope"));
-    mockCompat({ requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess });
+    mockCompat({
+      requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess,
+    });
     const getLicenseFn = neverCalledFn;
     await checkIncompatibleKeySystemsErrorMessage([{ type: "foo",
                                                      getLicense: getLicenseFn }]);
@@ -104,7 +106,9 @@ describe("core - decrypt - global tests - media key system access", () => {
 
   it("should throw if given multiple incompatible keySystemsConfigs", async () => {
     const mockRequestMediaKeySystemAccess = jest.fn(() => Promise.reject("nope"));
-    mockCompat({ requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess });
+    mockCompat({
+      requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess,
+    });
     const config = [ { type: "foo", getLicense: neverCalledFn },
                      { type: "bar", getLicense: neverCalledFn },
                      { type: "baz", getLicense: neverCalledFn } ];
@@ -118,25 +122,11 @@ describe("core - decrypt - global tests - media key system access", () => {
       .toHaveBeenNthCalledWith(3, "baz", defaultKSConfig);
   });
 
-  /* eslint-disable max-len */
-  it("should throw an error if no implementation of requestMediaKeySystemAccess is set", async () => {
-  /* eslint-enable max-len */
-    mockCompat({ requestMediaKeySystemAccess: undefined });
-    const mediaElement = document.createElement("video");
-    const ContentDecryptor = jest.requireActual("../../content_decryptor").default;
-
-    const config = [{ type: "foo", getLicense: neverCalledFn }];
-    const error : any = await testContentDecryptorError(ContentDecryptor,
-                                                        mediaElement,
-                                                        config);
-    expect(error).not.toBe(null);
-    expect(error.message)
-      .toEqual("requestMediaKeySystemAccess is not implemented in your browser.");
-  });
-
   it("should throw if given a single incompatible keySystemsConfigs", async () => {
     const mockRequestMediaKeySystemAccess = jest.fn(() => Promise.reject("nope"));
-    mockCompat({ requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess });
+    mockCompat({
+      requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess,
+    });
     await checkIncompatibleKeySystemsErrorMessage([{ type: "foo",
                                                      getLicense: neverCalledFn }]);
     expect(mockRequestMediaKeySystemAccess).toHaveBeenCalledTimes(1);
@@ -147,7 +137,9 @@ describe("core - decrypt - global tests - media key system access", () => {
   it("should set persistentState value if persistentState is set to \"required\"", async () => {
   /* eslint-enable max-len */
     const mockRequestMediaKeySystemAccess = jest.fn(() => Promise.reject("nope"));
-    mockCompat({ requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess });
+    mockCompat({
+      requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess,
+    });
     await checkIncompatibleKeySystemsErrorMessage([{ type: "foo",
                                                      getLicense: neverCalledFn,
                                                      persistentState: "required" }]);
@@ -163,7 +155,9 @@ describe("core - decrypt - global tests - media key system access", () => {
   it("should set persistentState value if persistentState is set to \"not-allowed\"", async () => {
   /* eslint-enable max-len */
     const mockRequestMediaKeySystemAccess = jest.fn(() => Promise.reject("nope"));
-    mockCompat({ requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess });
+    mockCompat({
+      requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess,
+    });
     await checkIncompatibleKeySystemsErrorMessage([{ type: "foo",
                                                      getLicense: neverCalledFn,
                                                      persistentState: "not-allowed" }]);
@@ -195,12 +189,15 @@ describe("core - decrypt - global tests - media key system access", () => {
   it("should set distinctiveIdentifier value if distinctiveIdentifier is set to \"required\"", async () => {
   /* eslint-enable max-len */
     const mockRequestMediaKeySystemAccess = jest.fn(() => Promise.reject("nope"));
-    mockCompat({ requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess });
-    await checkIncompatibleKeySystemsErrorMessage([{
-      type: "foo",
-      getLicense: neverCalledFn,
-      distinctiveIdentifier: "required",
-    }]);
+    mockCompat({
+      requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess,
+    });
+    await checkIncompatibleKeySystemsErrorMessage(
+      [{
+        type: "foo",
+        getLicense: neverCalledFn,
+        distinctiveIdentifier: "required",
+      }]);
     expect(mockRequestMediaKeySystemAccess).toHaveBeenCalledTimes(1);
 
     const expectedConfig = defaultKSConfig.map(conf => {
@@ -213,12 +210,15 @@ describe("core - decrypt - global tests - media key system access", () => {
   it("should set distinctiveIdentifier value if distinctiveIdentifier is set to \"not-allowed\"", async () => {
   /* eslint-enable max-len */
     const mockRequestMediaKeySystemAccess = jest.fn(() => Promise.reject("nope"));
-    mockCompat({ requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess });
-    await checkIncompatibleKeySystemsErrorMessage([{
-      type: "foo",
-      getLicense: neverCalledFn,
-      distinctiveIdentifier: "not-allowed",
-    }]);
+    mockCompat({
+      requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess,
+    });
+    await checkIncompatibleKeySystemsErrorMessage(
+      [{
+        type: "foo",
+        getLicense: neverCalledFn,
+        distinctiveIdentifier: "not-allowed",
+      }]);
     expect(mockRequestMediaKeySystemAccess).toHaveBeenCalledTimes(1);
 
     const expectedConfig = defaultKSConfig.map(conf => {
@@ -249,7 +249,9 @@ describe("core - decrypt - global tests - media key system access", () => {
   it("should want persistent sessions if persistentLicenseConfig is set", async () => {
   /* eslint-enable max-len */
     const mockRequestMediaKeySystemAccess = jest.fn(() => Promise.reject("nope"));
-    mockCompat({ requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess });
+    mockCompat({
+      requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess,
+    });
     const persistentLicenseConfig = { save() { throw new Error("Should not save."); },
                                       load() { throw new Error("Should not load."); } };
     await checkIncompatibleKeySystemsErrorMessage([{ type: "foo",
@@ -268,7 +270,9 @@ describe("core - decrypt - global tests - media key system access", () => {
 
   it("should do nothing if persistentLicenseConfig is set to null", async () => {
     const mockRequestMediaKeySystemAccess = jest.fn(() => Promise.reject("nope"));
-    mockCompat({ requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess });
+    mockCompat({
+      requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess,
+    });
     await checkIncompatibleKeySystemsErrorMessage([{ type: "foo",
                                                      getLicense: neverCalledFn,
                                                      persistentLicenseConfig: null }]);
@@ -278,7 +282,9 @@ describe("core - decrypt - global tests - media key system access", () => {
 
   it("should do nothing if persistentLicenseConfig is set to undefined", async () => {
     const mockRequestMediaKeySystemAccess = jest.fn(() => Promise.reject("nope"));
-    mockCompat({ requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess });
+    mockCompat({
+      requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess,
+    });
     await checkIncompatibleKeySystemsErrorMessage([{
       type: "foo",
       getLicense: neverCalledFn,
@@ -290,7 +296,9 @@ describe("core - decrypt - global tests - media key system access", () => {
 
   it("should translate a `clearkey` keySystem", async () => {
     const mockRequestMediaKeySystemAccess = jest.fn(() => Promise.reject("nope"));
-    mockCompat({ requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess });
+    mockCompat({
+      requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess,
+    });
     await checkIncompatibleKeySystemsErrorMessage([{ type: "clearkey",
                                                      getLicense: neverCalledFn }]);
     expect(mockRequestMediaKeySystemAccess).toHaveBeenCalledTimes(2);
@@ -302,7 +310,9 @@ describe("core - decrypt - global tests - media key system access", () => {
 
   it("should translate a `widevine` keySystem", async () => {
     const mockRequestMediaKeySystemAccess = jest.fn(() => Promise.reject("nope"));
-    mockCompat({ requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess });
+    mockCompat({
+      requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess,
+    });
     await checkIncompatibleKeySystemsErrorMessage([{ type: "widevine",
                                                      getLicense: neverCalledFn }]);
     expect(mockRequestMediaKeySystemAccess).toHaveBeenCalledTimes(1);
@@ -312,7 +322,9 @@ describe("core - decrypt - global tests - media key system access", () => {
 
   it("should translate a `playready` keySystem", async () => {
     const mockRequestMediaKeySystemAccess = jest.fn(() => Promise.reject("nope"));
-    mockCompat({ requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess });
+    mockCompat({
+      requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess,
+    });
     await checkIncompatibleKeySystemsErrorMessage([{ type: "playready",
                                                      getLicense: neverCalledFn }]);
     expect(mockRequestMediaKeySystemAccess).toHaveBeenCalledTimes(4);
@@ -330,7 +342,9 @@ describe("core - decrypt - global tests - media key system access", () => {
 
   it("should translate a `fairplay` keySystem", async () => {
     const mockRequestMediaKeySystemAccess = jest.fn(() => Promise.reject("nope"));
-    mockCompat({ requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess });
+    mockCompat({
+      requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess,
+    });
     await checkIncompatibleKeySystemsErrorMessage([{ type: "fairplay",
                                                      getLicense: neverCalledFn }]);
     expect(mockRequestMediaKeySystemAccess).toHaveBeenCalledTimes(1);
@@ -340,7 +354,9 @@ describe("core - decrypt - global tests - media key system access", () => {
 
   it("should translate a multiple keySystems at the same time", async () => {
     const mockRequestMediaKeySystemAccess = jest.fn(() => Promise.reject("nope"));
-    mockCompat({ requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess });
+    mockCompat({
+      requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess,
+    });
     await checkIncompatibleKeySystemsErrorMessage([{ type: "playready",
                                                      getLicense: neverCalledFn },
                                                    { type: "clearkey",
@@ -366,7 +382,9 @@ describe("core - decrypt - global tests - media key system access", () => {
   it("should translate a multiple keySystems at the same time with different configs", async () => {
   /* eslint-enable max-len */
     const mockRequestMediaKeySystemAccess = jest.fn(() => Promise.reject("nope"));
-    mockCompat({ requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess });
+    mockCompat({
+      requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess,
+    });
     await checkIncompatibleKeySystemsErrorMessage([{ type: "playready",
                                                      persistentLicenseConfig: {
                                                        load() { return []; },
@@ -508,7 +526,9 @@ describe("core - decrypt - global tests - media key system access", () => {
       const mockRequestMediaKeySystemAccess = jest.fn((keyType, conf) => {
         return requestMediaKeySystemAccessNoMediaKeys(keyType, conf);
       });
-      mockCompat({ requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess });
+      mockCompat({
+        requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess,
+      });
       const config = [{ type: "com.widevine.alpha",
                         getLicense: neverCalledFn }];
 
@@ -538,7 +558,9 @@ describe("core - decrypt - global tests - media key system access", () => {
         }
         return Promise.reject("nope");
       });
-      mockCompat({ requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess });
+      mockCompat({
+        requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess,
+      });
       const config = [{ type: "com.widevine.alpha",
                         getLicense: neverCalledFn },
                       { type: "some-other-working-key-system",
@@ -572,7 +594,9 @@ describe("core - decrypt - global tests - media key system access", () => {
           return Promise.reject("nope");
         });
       });
-      mockCompat({ requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess });
+      mockCompat({
+        requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess,
+      });
       const mediaElement = document.createElement("video");
       const ContentDecryptor = jest.requireActual("../../content_decryptor").default;
 
@@ -600,7 +624,9 @@ describe("core - decrypt - global tests - media key system access", () => {
         rmksHasBeenCalled = true;
         throw new Error("nope");
       });
-      mockCompat({ requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess });
+      mockCompat({
+        requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess,
+      });
       const mediaElement = document.createElement("video");
       const ContentDecryptor = jest.requireActual("../../content_decryptor").default;
 

package/src/core/decrypt/__tests__/__global__/media_keys.test.ts

@@ -60,15 +60,18 @@ describe("core - decrypt - global tests - media key system access", () => {
                                getConfiguration() { return conf; },
                                createMediaKeys() { throw new Error("No non no"); } });
     }
-    mockCompat({ requestMediaKeySystemAccess: requestMediaKeySystemAccessBadMediaKeys });
+    mockCompat({
+      requestMediaKeySystemAccess: jest.fn(requestMediaKeySystemAccessBadMediaKeys),
+    });
 
     // == test ==
     const ContentDecryptor = jest.requireActual("../../content_decryptor").default;
-    const error : any =
-      await testContentDecryptorError(ContentDecryptor, videoElt, ksConfig);
+    const error : any = await testContentDecryptorError(ContentDecryptor,
+                                                        videoElt,
+                                                        ksConfig);
     expect(error).toBeInstanceOf(Error);
     expect(error.message).toEqual(
-      "EncryptedMediaError (CREATE_MEDIA_KEYS_ERROR) No non no"
+      "CREATE_MEDIA_KEYS_ERROR: No non no"
     );
     expect(error.name).toEqual("EncryptedMediaError");
     expect(error.code).toEqual("CREATE_MEDIA_KEYS_ERROR");
@@ -86,15 +89,18 @@ describe("core - decrypt - global tests - media key system access", () => {
         createMediaKeys: () => Promise.reject(new Error("No non no")),
       });
     }
-    mockCompat({ requestMediaKeySystemAccess: requestMediaKeySystemAccessRejMediaKeys });
+    mockCompat({
+      requestMediaKeySystemAccess: jest.fn(requestMediaKeySystemAccessRejMediaKeys),
+    });
 
     // == test ==
     const ContentDecryptor = jest.requireActual("../../content_decryptor").default;
-    const error : any =
-      await testContentDecryptorError(ContentDecryptor, videoElt, ksConfig);
+    const error : any = await testContentDecryptorError(ContentDecryptor,
+                                                        videoElt,
+                                                        ksConfig);
     expect(error).toBeInstanceOf(Error);
     expect(error.message).toEqual(
-      "EncryptedMediaError (CREATE_MEDIA_KEYS_ERROR) No non no"
+      "CREATE_MEDIA_KEYS_ERROR: No non no"
     );
     expect(error.name).toEqual("EncryptedMediaError");
     expect(error.code).toEqual("CREATE_MEDIA_KEYS_ERROR");
@@ -104,10 +110,10 @@ describe("core - decrypt - global tests - media key system access", () => {
   it("should go into the WaitingForAttachment state if createMediaKeys resolves", () => {
   /* eslint-enable max-len */
     return new Promise<void>((res, rej) => {
-      mockCompat({});
+      mockCompat();
       const mockCreateMediaKeys = jest.spyOn(MediaKeySystemAccessImpl.prototype,
                                              "createMediaKeys");
-      const { ContentDecryptorState } = jest.requireActual("../../content_decryptor");
+      const { ContentDecryptorState } = jest.requireActual("../../types");
       const ContentDecryptor = jest.requireActual("../../content_decryptor").default;
       const contentDecryptor = new ContentDecryptor(videoElt, ksConfig);
       let receivedStateChange = 0;
@@ -134,10 +140,10 @@ describe("core - decrypt - global tests - media key system access", () => {
   it("should not call createMediaKeys again if previous one is compatible", () => {
   /* eslint-enable max-len */
     return new Promise<void>((res, rej) => {
-      mockCompat({});
+      mockCompat();
       const mockCreateMediaKeys = jest.spyOn(MediaKeySystemAccessImpl.prototype,
                                              "createMediaKeys");
-      const { ContentDecryptorState } = jest.requireActual("../../content_decryptor");
+      const { ContentDecryptorState } = jest.requireActual("../../types");
       const ContentDecryptor = jest.requireActual("../../content_decryptor").default;
 
       const contentDecryptor1 = new ContentDecryptor(videoElt, ksConfig);
@@ -197,7 +203,7 @@ describe("core - decrypt - global tests - media key system access", () => {
       });
       const mockCreateMediaKeys = jest.spyOn(MediaKeySystemAccessImpl.prototype,
                                              "createMediaKeys");
-      const { ContentDecryptorState } = jest.requireActual("../../content_decryptor");
+      const { ContentDecryptorState } = jest.requireActual("../../types");
       const ContentDecryptor = jest.requireActual("../../content_decryptor").default;
 
       const contentDecryptor1 = new ContentDecryptor(videoElt, ksConfig);
@@ -257,7 +263,7 @@ describe("core - decrypt - global tests - media key system access", () => {
       });
       const mockCreateMediaKeys = jest.spyOn(MediaKeySystemAccessImpl.prototype,
                                              "createMediaKeys");
-      const { ContentDecryptorState } = jest.requireActual("../../content_decryptor");
+      const { ContentDecryptorState } = jest.requireActual("../../types");
       const ContentDecryptor = jest.requireActual("../../content_decryptor").default;
 
       const contentDecryptor1 = new ContentDecryptor(videoElt, ksConfig);
@@ -318,7 +324,7 @@ describe("core - decrypt - global tests - media key system access", () => {
     const mockCreateSession = jest.spyOn(MediaKeysImpl.prototype, "createSession");
 
     // == test ==
-    const { ContentDecryptorState } = jest.requireActual("../../content_decryptor");
+    const { ContentDecryptorState } = jest.requireActual("../../types");
     const ContentDecryptor = jest.requireActual("../../content_decryptor").default;
     const contentDecryptor = new ContentDecryptor(videoElt, ksConfig);
     contentDecryptor.addEventListener("stateChange", (newState: any) => {

package/src/core/decrypt/__tests__/__global__/server_certificate.test.ts

@@ -55,6 +55,7 @@ describe("core - decrypt - global tests - server certificate", () => {
     mockSetMediaKeys.mockImplementation(() => {
       expect(mockCreateSession).not.toHaveBeenCalled();
       expect(mockSetServerCertificate).not.toHaveBeenCalled();
+      return Promise.resolve();
     });
     const mockCreateSession = jest.spyOn(MediaKeysImpl.prototype, "createSession");
     const mockSetServerCertificate =
@@ -65,7 +66,7 @@ describe("core - decrypt - global tests - server certificate", () => {
           return Promise.resolve(true);
         });
 
-    const { ContentDecryptorState } = jest.requireActual("../../content_decryptor");
+    const { ContentDecryptorState } = jest.requireActual("../../types");
     const ContentDecryptor = jest.requireActual("../../content_decryptor").default;
     const contentDecryptor = new ContentDecryptor(videoElt, ksConfigCert);
 
@@ -78,15 +79,15 @@ describe("core - decrypt - global tests - server certificate", () => {
           expect(mockSetServerCertificate).not.toHaveBeenCalled();
           contentDecryptor.attach();
         }, 5);
+        setTimeout(() => {
+          contentDecryptor.dispose();
+          expect(mockSetMediaKeys).toHaveBeenCalledTimes(1);
+          expect(mockSetServerCertificate).toHaveBeenCalledTimes(1);
+          expect(mockCreateSession).not.toHaveBeenCalled();
+          done();
+        }, 10);
       }
     });
-    setTimeout(() => {
-      contentDecryptor.dispose();
-      expect(mockSetMediaKeys).toHaveBeenCalledTimes(1);
-      expect(mockSetServerCertificate).toHaveBeenCalledTimes(1);
-      expect(mockCreateSession).not.toHaveBeenCalled();
-      done();
-    }, 10);
   });
 
   it("should not call serverCertificate multiple times on init data", (done) => {
@@ -94,6 +95,7 @@ describe("core - decrypt - global tests - server certificate", () => {
     mockSetMediaKeys.mockImplementation(() => {
       expect(mockCreateSession).not.toHaveBeenCalled();
       expect(mockSetServerCertificate).not.toHaveBeenCalled();
+      return Promise.resolve();
     });
     const mockCreateSession = jest.spyOn(MediaKeysImpl.prototype, "createSession");
     const mockSetServerCertificate =
@@ -104,7 +106,7 @@ describe("core - decrypt - global tests - server certificate", () => {
           return Promise.resolve(true);
         });
 
-    const { ContentDecryptorState } = jest.requireActual("../../content_decryptor");
+    const { ContentDecryptorState } = jest.requireActual("../../types");
     const ContentDecryptor = jest.requireActual("../../content_decryptor").default;
     const contentDecryptor = new ContentDecryptor(videoElt, ksConfigCert);
 
@@ -130,7 +132,7 @@ describe("core - decrypt - global tests - server certificate", () => {
       expect(mockSetServerCertificate).toHaveBeenCalledTimes(1);
       expect(mockCreateSession).toHaveBeenCalledTimes(1);
       done();
-    }, 10);
+    }, 100);
   });
 
   /* eslint-disable max-len */
@@ -145,7 +147,7 @@ describe("core - decrypt - global tests - server certificate", () => {
           throw new Error("some error");
         });
 
-    const { ContentDecryptorState } = jest.requireActual("../../content_decryptor");
+    const { ContentDecryptorState } = jest.requireActual("../../types");
     const ContentDecryptor = jest.requireActual("../../content_decryptor").default;
     const contentDecryptor = new ContentDecryptor(videoElt, ksConfigCert);
 
@@ -184,7 +186,7 @@ describe("core - decrypt - global tests - server certificate", () => {
           return Promise.reject(new Error("some error"));
         });
 
-    const { ContentDecryptorState } = jest.requireActual("../../content_decryptor");
+    const { ContentDecryptorState } = jest.requireActual("../../types");
     const ContentDecryptor = jest.requireActual("../../content_decryptor").default;
     const contentDecryptor = new ContentDecryptor(videoElt, ksConfigCert);
 
@@ -225,11 +227,12 @@ describe("core - decrypt - global tests - server certificate", () => {
     mockSetMediaKeys.mockImplementation(() => {
       expect(mockCreateSession).not.toHaveBeenCalled();
       expect(mockSetServerCertificate).not.toHaveBeenCalled();
+      return Promise.resolve();
     });
     const mockCreateSession = jest.spyOn(MediaKeysImpl.prototype, "createSession");
     const mockSetServerCertificate = jest.spyOn(MediaKeysImpl.prototype,
                                                 "setServerCertificate");
-    const { ContentDecryptorState } = jest.requireActual("../../content_decryptor");
+    const { ContentDecryptorState } = jest.requireActual("../../types");
     const ContentDecryptor = jest.requireActual("../../content_decryptor").default;
     const contentDecryptor = new ContentDecryptor(videoElt, ksConfigCert);