Add an after hook to delete tinymce

Author: tiny-ben-tran

tinymce-angular-component/src/test/ts/alien/InitTestEnvironment.ts

@@ -2,10 +2,10 @@ import 'core-js/features/reflect';
 
 import { TestBed } from '@angular/core/testing';
 import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing';
-import { NgModule, provideZonelessChangeDetection } from '@angular/core';
+import { NgModule } from '@angular/core';
 
 @NgModule({
-  providers: [ provideZonelessChangeDetection() ],
+  providers: [],
 })
 class AppTestingModule {}
 

tinymce-angular-component/src/test/ts/alien/TestHooks.ts

@@ -23,9 +23,8 @@ export const tinymceVersionHook = (version: Version) => {
   before(async () => {
     await VersionLoader.pLoadVersion(version);
   });
-  after(() => {
-    deleteTinymce();
-  });
+
+  after(deleteTinymce);
 };
 
 export interface EditorFixture<T> extends ComponentFixture<T> {
@@ -72,7 +71,7 @@ export const editorHook = <T = unknown>(component: Type<T>, moduleDef: TestModul
     return firstValueFrom(
 
       editorComponent.onInit.pipe(
-        throwTimeout(15000, `Timed out waiting for editor to load`),
+        throwTimeout(10000, `Timed out waiting for editor to load`),
         switchMap(
           ({ editor }) =>
             new Promise<Editor>((resolve) => {
@@ -85,14 +84,14 @@ export const editorHook = <T = unknown>(component: Type<T>, moduleDef: TestModul
                 // after global tinymce is removed in a clean up. Specifically, it happens when unloading/loading different versions of TinyMCE
                 if (editor.licenseKeyManager) {
                   editor.licenseKeyManager.validate({}).then(() => {
-                    setTimeout(() => {
+                    // setTimeout(() => {
                       resolve(editor as Editor);
-                    }, 500);
+                    // }, 500);
                   }).catch((reason) => console.warn(reason));
                 } else {
-                  setTimeout(() => {
+                  // setTimeout(() => {
                     resolve(editor as Editor);
-                  }, 500);
+                  // }, 500);
                 }
               });
             })

tinymce-angular-component/src/test/ts/browser/EventBlacklistingTest.ts

@@ -1,16 +1,20 @@
 import '../alien/InitTestEnvironment';
 
-import { describe, it } from '@ephox/bedrock-client';
+import { after, describe, it } from '@ephox/bedrock-client';
 
 import { EditorComponent } from '../../../main/ts/public_api';
 import { eachVersionContext, editorHook } from '../alien/TestHooks';
 import { map, merge, timer, first, buffer, firstValueFrom } from 'rxjs';
 import { Assertions } from '@ephox/agar';
 import { Fun } from '@ephox/katamari';
-import { supportedTinymceVersions, throwTimeout } from '../alien/TestHelpers';
+import { deleteTinymce, supportedTinymceVersions, throwTimeout } from '../alien/TestHelpers';
 
 describe('EventBlacklistingTest', () => {
   eachVersionContext(supportedTinymceVersions(), () => {
+    after(() => {
+      deleteTinymce();
+    });
+
     const createFixture = editorHook(EditorComponent);
 
     it('Events should be bound when allowed', async () => {

tinymce-angular-component/src/test/ts/browser/LoadTinyTest.ts

@@ -1,7 +1,7 @@
 import '../alien/InitTestEnvironment';
 
 import { Assertions } from '@ephox/agar';
-import { describe, it, context, before } from '@ephox/bedrock-client';
+import { describe, it, context, after } from '@ephox/bedrock-client';
 import { Global } from '@ephox/katamari';
 
 import { EditorComponent, TINYMCE_SCRIPT_SRC } from '../../../main/ts/public_api';
@@ -28,7 +28,7 @@ describe('LoadTinyTest', () => {
         ],
       });
 
-      before(deleteTinymce);
+      after(deleteTinymce);
 
       it('Should be able to load local version of TinyMCE specified via dependency injection', async () => {
         const { editor } = await createFixture();
@@ -51,7 +51,7 @@ describe('LoadTinyTest', () => {
     context(`With cloud version ${version}`, () => {
       const createFixture = editorHook(EditorComponent);
 
-      before(deleteTinymce);
+      after(deleteTinymce);
 
       it(`Should be able to load TinyMCE ${version} from Cloud`, async () => {
         const { editor } = await createFixture({ cloudChannel: version, apiKey: key });