test(@angular-devkit/core): update several tests to use async expectations

Using Jasmine's `expectAsync` allows for reduced test code when testing that
a function returning a promise rejects with a specific error.

Author: clydin

packages/angular_devkit/core/src/experimental/jobs/simple-scheduler_spec.ts

@@ -13,7 +13,11 @@ import { promisify } from 'util';
 import { JobHandlerContext, JobOutboundMessage, JobOutboundMessageKind, JobState } from './api';
 import { createJobHandler } from './create-job-handler';
 import { SimpleJobRegistry } from './simple-registry';
-import { SimpleScheduler } from './simple-scheduler';
+import {
+  JobArgumentSchemaValidationError,
+  JobOutputSchemaValidationError,
+  SimpleScheduler,
+} from './simple-scheduler';
 
 const flush = promisify(setImmediate);
 
@@ -94,16 +98,9 @@ describe('SimpleScheduler', () => {
     );
 
     await scheduler.schedule('add', [1, 2, 3, 4]).output.toPromise();
-    try {
-      await scheduler.schedule('add', ['1', 2, 3, 4]).output.toPromise();
-      expect(true).toBe(false);
-    } catch (e) {
-      // TODO: enable this when https://github.com/bazelbuild/rules_typescript/commit/37807e2c4
-      // is released, otherwise this breaks because bazel downgrade to ES5 which does not support
-      // extending Error.
-      // expect(e instanceof JobInboundMessageSchemaValidationError).toBe(true);
-      expect(e.message).toMatch(/"\/0" must be number/);
-    }
+    await expectAsync(
+      scheduler.schedule('add', ['1', 2, 3, 4]).output.toPromise(),
+    ).toBeRejectedWithError(JobArgumentSchemaValidationError);
   });
 
   it('validates outputs', async () => {
@@ -115,16 +112,9 @@ describe('SimpleScheduler', () => {
       },
     );
 
-    try {
-      await scheduler.schedule('add', [1, 2, 3, 4]).output.toPromise();
-      expect(true).toBe(false);
-    } catch (e) {
-      // TODO: enable this when https://github.com/bazelbuild/rules_typescript/commit/37807e2c4
-      // is released, otherwise this breaks because bazel downgrade to ES5 which does not support
-      // extending Error.
-      // expect(e instanceof JobOutputSchemaValidationError).toBe(true);
-      expect(e.message).toMatch(/"".*number/);
-    }
+    await expectAsync(
+      scheduler.schedule('add', [1, 2, 3, 4]).output.toPromise(),
+    ).toBeRejectedWithError(JobOutputSchemaValidationError);
   });
 
   it('works with dependencies', async () => {

packages/angular_devkit/core/src/workspace/core_spec.ts

@@ -116,12 +116,9 @@ describe('readWorkspace', () => {
       },
     };
 
-    try {
-      await readWorkspace(requestedPath, host);
-      fail();
-    } catch (e) {
-      expect(e.message).toContain('Unable to determine format for workspace path');
-    }
+    await expectAsync(readWorkspace(requestedPath, host)).toBeRejectedWithError(
+      /Unable to determine format for workspace path/,
+    );
   });
 
   it('errors when reading from specified file path with invalid specified format', async () => {
@@ -146,12 +143,9 @@ describe('readWorkspace', () => {
       },
     };
 
-    try {
-      await readWorkspace(requestedPath, host, 12 as WorkspaceFormat);
-      fail();
-    } catch (e) {
-      expect(e.message).toContain('Unsupported workspace format');
-    }
+    await expectAsync(
+      readWorkspace(requestedPath, host, 12 as WorkspaceFormat),
+    ).toBeRejectedWithError(/Unsupported workspace format/);
   });
 
   it('attempts to find/read from directory path', async () => {
@@ -260,12 +254,9 @@ describe('readWorkspace', () => {
       },
     };
 
-    try {
-      await readWorkspace(requestedPath, host);
-      fail();
-    } catch (e) {
-      expect(e.message).toContain('Unable to locate a workspace file');
-    }
+    await expectAsync(readWorkspace(requestedPath, host)).toBeRejectedWithError(
+      /Unable to locate a workspace file/,
+    );
   });
 });
 
@@ -324,12 +315,9 @@ describe('writeWorkspace', () => {
       },
     };
 
-    try {
-      await writeWorkspace({} as WorkspaceDefinition, host, requestedPath, 12 as WorkspaceFormat);
-      fail();
-    } catch (e) {
-      expect(e.message).toContain('Unsupported workspace format');
-    }
+    await expectAsync(
+      writeWorkspace({} as WorkspaceDefinition, host, requestedPath, 12 as WorkspaceFormat),
+    ).toBeRejectedWithError(/Unsupported workspace format/);
   });
 
   it('errors when writing custom workspace without specified format', async () => {
@@ -356,11 +344,8 @@ describe('writeWorkspace', () => {
       },
     };
 
-    try {
-      await writeWorkspace({} as WorkspaceDefinition, host, requestedPath);
-      fail();
-    } catch (e) {
-      expect(e.message).toContain('A format is required');
-    }
+    await expectAsync(
+      writeWorkspace({} as WorkspaceDefinition, host, requestedPath),
+    ).toBeRejectedWithError(/A format is required/);
   });
 });

packages/angular_devkit/core/src/workspace/json/reader_spec.ts

@@ -120,12 +120,9 @@ describe('readJsonWorkpace Parsing', () => {
       }
     `);
 
-    try {
-      await readJsonWorkspace('', host);
-      fail();
-    } catch (e) {
-      expect(e.message).toContain('Invalid format version detected');
-    }
+    await expectAsync(readJsonWorkspace('', host)).toBeRejectedWithError(
+      /Invalid format version detected/,
+    );
   });
 
   it('errors on missing version', async () => {
@@ -136,12 +133,9 @@ describe('readJsonWorkpace Parsing', () => {
       }
     `);
 
-    try {
-      await readJsonWorkspace('', host);
-      fail();
-    } catch (e) {
-      expect(e.message).toContain('version specifier not found');
-    }
+    await expectAsync(readJsonWorkspace('', host)).toBeRejectedWithError(
+      /version specifier not found/,
+    );
   });
 });
 

packages/angular_devkit/core/src/workspace/json/writer_spec.ts

@@ -45,7 +45,7 @@ function createTestCaseHost(inputData = '') {
         );
         expect(data).toEqual(testCase);
       } catch (e) {
-        fail(`Unable to load test case '${path}': ${e.message || e}`);
+        fail(`Unable to load test case '${path}': ${e instanceof Error ? e.message : e}`);
       }
     },
     async isFile() {