refactor: make tests compatible with @types/mocha

dgp1130 · dgp1130 · commit d95bb6325951 · 2023-09-19T13:25:21.000-07:00
Mocha global types will get pulled in by Web Test Runner, unfortunately. So we need to make our tests match that API syntax.

TODO: Should we shift the dependency to `@web/test-runner-core` instead to avoid this dep?
diff --git a/packages/angular_devkit/build_angular/src/builders/browser/specs/styles_spec.ts b/packages/angular_devkit/build_angular/src/builders/browser/specs/styles_spec.ts
@@ -327,7 +327,12 @@ describe('Browser Builder styles', () => {
   });
 
   // TODO: consider making this a unit test in the url processing plugins.
-  it(
+  const jasmineIt = it as (
+    expectation: string,
+    assertion: jasmine.ImplementationCallback,
+    timeout?: number,
+  ) => void;
+  jasmineIt(
     `supports baseHref/deployUrl in resource urls`,
     async () => {
       // Use a large image for the relative ref so it cannot be inlined.
diff --git a/packages/angular_devkit/build_angular/src/builders/browser/tests/options/watch_spec.ts b/packages/angular_devkit/build_angular/src/builders/browser/tests/options/watch_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { concatMap, count, take, timeout } from 'rxjs';
+import { concatMap, count, firstValueFrom, map, take, timeout, toArray } from 'rxjs';
 import { buildWebpackBrowser } from '../../index';
 import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup';
 
@@ -17,57 +17,43 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
       await harness.writeFile('src/main.ts', '');
     });
 
-    it('does not wait for file changes when false', (done) => {
+    it('does not wait for file changes when false', async () => {
       harness.useTarget('build', {
         ...BASE_OPTIONS,
         watch: false,
       });
 
-      // If the build waits then it will timeout with the custom timeout.
-      // A single build should not take more than 15 seconds.
-      let count = 0;
-      harness
-        .execute()
-        .pipe(timeout(15000))
-        .subscribe({
-          complete() {
-            expect(count).toBe(1);
-            done();
-          },
-          next({ result }) {
-            count++;
-            expect(result?.success).toBe(true);
-          },
-          error(error) {
-            done.fail(error);
-          },
-        });
+      const results = await firstValueFrom(
+        harness.execute().pipe(
+          // If the build waits then it will timeout with the custom timeout.
+          // A single build should not take more than 15 seconds.
+          timeout(15000),
+          map(({ result }) => result),
+          toArray(),
+        ),
+      );
+
+      expect(results.length).toBe(1);
+      expect(results[0]?.success).toBe(true);
     });
 
-    it('does not wait for file changes when not present', (done) => {
+    it('does not wait for file changes when not present', async () => {
       harness.useTarget('build', {
         ...BASE_OPTIONS,
       });
 
       // If the build waits then it will timeout with the custom timeout.
       // A single build should not take more than 15 seconds.
-      let count = 0;
-      harness
-        .execute()
-        .pipe(timeout(15000))
-        .subscribe({
-          complete() {
-            expect(count).toBe(1);
-            done();
-          },
-          next({ result }) {
-            count++;
-            expect(result?.success).toBe(true);
-          },
-          error(error) {
-            done.fail(error);
-          },
-        });
+      const results = await firstValueFrom(
+        harness.execute().pipe(
+          timeout(15000),
+          map(({ result }) => result),
+          toArray(),
+        ),
+      );
+
+      expect(results.length).toBe(1);
+      expect(results[0]?.success).toBeTrue();
     });
 
     it('watches for file changes when true', async () => {
diff --git a/packages/angular_devkit/build_angular/src/tools/babel/plugins/adjust-static-class-members_spec.ts b/packages/angular_devkit/build_angular/src/tools/babel/plugins/adjust-static-class-members_spec.ts
@@ -21,7 +21,7 @@ function testCase({
   input: string;
   expected: string | typeof NO_CHANGE;
   options?: { wrapDecorators?: boolean };
-}): jasmine.ImplementationCallback {
+}) {
   return async () => {
     const result = transformSync(input, {
       configFile: false,
diff --git a/packages/angular_devkit/build_angular/src/tools/babel/plugins/adjust-typescript-enums_spec.ts b/packages/angular_devkit/build_angular/src/tools/babel/plugins/adjust-typescript-enums_spec.ts
@@ -13,13 +13,7 @@ import adjustTypeScriptEnums from './adjust-typescript-enums';
 
 const NO_CHANGE = Symbol('NO_CHANGE');
 
-function testCase({
-  input,
-  expected,
-}: {
-  input: string;
-  expected: string | typeof NO_CHANGE;
-}): jasmine.ImplementationCallback {
+function testCase({ input, expected }: { input: string; expected: string | typeof NO_CHANGE }) {
   return async () => {
     const result = transformSync(input, {
       configFile: false,
diff --git a/packages/angular_devkit/build_angular/src/tools/babel/plugins/elide-angular-metadata_spec.ts b/packages/angular_devkit/build_angular/src/tools/babel/plugins/elide-angular-metadata_spec.ts
@@ -11,13 +11,7 @@ import { transformSync } from '@babel/core';
 import { format } from 'prettier';
 import elideAngularMetadata from './elide-angular-metadata';
 
-function testCase({
-  input,
-  expected,
-}: {
-  input: string;
-  expected: string;
-}): jasmine.ImplementationCallback {
+function testCase({ input, expected }: { input: string; expected: string }) {
   return async () => {
     const result = transformSync(input, {
       configFile: false,
diff --git a/packages/angular_devkit/build_angular/src/tools/babel/plugins/pure-toplevel-functions_spec.ts b/packages/angular_devkit/build_angular/src/tools/babel/plugins/pure-toplevel-functions_spec.ts
@@ -11,13 +11,7 @@ import { transformSync } from '@babel/core';
 import { format } from 'prettier';
 import pureTopLevelPlugin from './pure-toplevel-functions';
 
-function testCase({
-  input,
-  expected,
-}: {
-  input: string;
-  expected: string;
-}): jasmine.ImplementationCallback {
+function testCase({ input, expected }: { input: string; expected: string }) {
   return async () => {
     const result = transformSync(input, {
       configFile: false,
@@ -35,7 +29,7 @@ function testCase({
   };
 }
 
-function testCaseNoChange(input: string): jasmine.ImplementationCallback {
+function testCaseNoChange(input: string) {
   return testCase({ input, expected: input });
 }
 
