build: fixes needed in google3

alexeagle · hansl · commit 63389e5028a3 · 2018-07-09T16:14:18.000-07:00
diff --git a/packages/angular_devkit/schematics/src/rules/call.ts b/packages/angular_devkit/schematics/src/rules/call.ts
@@ -80,7 +80,7 @@ export function callRule(
   return input.pipe(mergeMap(inputTree => {
     const result = rule(inputTree, context);
 
-    if (result === undefined) {
+    if (!result) {
       return observableOf(inputTree);
     } else if (typeof result == 'function') {
       // This is considered a Rule, chain the rule and return its output.
diff --git a/packages/angular_devkit/schematics/src/tree/action_spec.ts b/packages/angular_devkit/schematics/src/tree/action_spec.ts
@@ -8,8 +8,6 @@
 import { normalize } from '@angular-devkit/core';
 import { Action, ActionList } from './action';
 
-type ExpectedAction = jasmine.ObjectContaining<Action>;
-
 describe('Action', () => {
   describe('optimize', () => {
     it('works with create', () => {
@@ -88,7 +86,7 @@ describe('Action', () => {
       actions.optimize();
       expect(actions.length).toBe(1);
       expect(actions.get(0)).toEqual(
-        jasmine.objectContaining({ kind: 'c', path: normalize('/test2') }) as ExpectedAction,
+        jasmine.objectContaining<Action>({ kind: 'c', path: normalize('/test2') }),
       );
     });
 
@@ -101,12 +99,12 @@ describe('Action', () => {
 
       actions.optimize();
       expect(actions.length).toBe(2);
-      expect(actions.get(0)).toEqual(jasmine.objectContaining({
+      expect(actions.get(0)).toEqual(jasmine.objectContaining<Action>({
         kind: 'r', path: normalize('/test'), to: normalize('/test2'),
-      }) as ExpectedAction);
-      expect(actions.get(1)).toEqual(jasmine.objectContaining({
-        kind: 'o', path: normalize('/test2'),
-      }) as ExpectedAction);
+      }));
+      expect(actions.get(1)).toEqual(
+        jasmine.objectContaining<Action>({kind: 'o', path: normalize('/test2') }),
+      );
     });
   });
 });
