fixes broken tests

Author: JohannesHoppe

deploy/actions.spec.ts

@@ -1,13 +1,9 @@
 import { JsonObject, logging } from '@angular-devkit/core';
-import {
-  BuilderContext,
-  BuilderRun,
-  ScheduleOptions,
-  Target
-} from '@angular-devkit/architect/src/index';
+import { BuilderContext, BuilderRun, ScheduleOptions, Target } from '@angular-devkit/architect/src/index';
 import deploy from './actions';
 
 let context: BuilderContext;
+const mockEngine = { run: (_: string, __: any, __2: any) => Promise.resolve() }
 
 const PROJECT = 'pirojok-project';
 
@@ -16,17 +12,10 @@ describe('Deploy Angular apps', () => {
 
   it('should invoke the builder', async () => {
     const spy = spyOn(context, 'scheduleTarget').and.callThrough();
-    await deploy(
-      {
-        publish: (_: string, __: any) => Promise.resolve()
-      },
-      context,
-      'host',
-      {}
-    );
+    await deploy(mockEngine, context, 'host', {});
+
     expect(spy).toHaveBeenCalled();
-    expect(spy).toHaveBeenCalledWith(
-      {
+    expect(spy).toHaveBeenCalledWith({
         target: 'build',
         configuration: 'production',
         project: PROJECT
@@ -35,28 +24,19 @@ describe('Deploy Angular apps', () => {
     );
   });
 
-  it('should invoke ghpages.publish', async () => {
-    const mock = {
-      publish: (_: string, __: any) => Promise.resolve()
-    };
-    const spy = spyOn(mock, 'publish').and.callThrough();
-    await deploy(mock, context, 'host', {});
+  it('should invoke engine.run', async () => {
+    const spy = spyOn(mockEngine, 'run').and.callThrough();
+    await deploy(mockEngine, context, 'host', {});
+
     expect(spy).toHaveBeenCalled();
-    expect(spy).toHaveBeenCalledWith('host', {});
+    expect(spy).toHaveBeenCalledWith('host', {}, context.logger);
   });
 
   describe('error handling', () => {
     it('throws if there is no target project', async () => {
       context.target = undefined;
       try {
-        await deploy(
-          {
-            publish: (_: string, __: any) => Promise.resolve()
-          },
-          context,
-          'host',
-          {}
-        );
+        await deploy(mockEngine, context, 'host', {});
         fail();
       } catch (e) {
         expect(e.message).toMatch(/Cannot execute the build target/);
@@ -81,17 +61,15 @@ const initMocks = () => {
     id: 1,
     logger: new logging.NullLogger() as any,
     workspaceRoot: 'cwd',
-    addTeardown: _ => {},
+    addTeardown: _ => { },
     validateOptions: _ => Promise.resolve({} as any),
     getBuilderNameForTarget: () => Promise.resolve(''),
     analytics: null as any,
     getTargetOptions: (_: Target) => Promise.resolve({}),
-    reportProgress: (_: number, __?: number, ___?: string) => {},
-    reportStatus: (_: string) => {},
-    reportRunning: () => {},
-    scheduleBuilder: (_: string, __?: JsonObject, ___?: ScheduleOptions) =>
-      Promise.resolve({} as BuilderRun),
-    scheduleTarget: (_: Target, __?: JsonObject, ___?: ScheduleOptions) =>
-      Promise.resolve({} as BuilderRun)
+    reportProgress: (_: number, __?: number, ___?: string) => { },
+    reportStatus: (_: string) => { },
+    reportRunning: () => { },
+    scheduleBuilder: (_: string, __?: JsonObject, ___?: ScheduleOptions) => Promise.resolve({} as BuilderRun),
+    scheduleTarget: (_: Target, __?: JsonObject, ___?: ScheduleOptions) => Promise.resolve({} as BuilderRun)
   };
 };

deploy/actions.ts

@@ -1,11 +1,11 @@
 import { BuilderContext } from '@angular-devkit/architect';
 import { Schema as RealDeployOptions } from './schema';
 import { json, logging } from '@angular-devkit/core';
-import { run } from '../engine/engine';
 
 type DeployOptions = RealDeployOptions & json.JsonObject;
 
 export default async function deploy(
+  engine: { run: (dir: string, options: RealDeployOptions, logger: logging.LoggerApi) => Promise<void> },
   context: BuilderContext,
   projectRoot: string,
   options: DeployOptions
@@ -18,13 +18,15 @@ export default async function deploy(
   context.logger.info(`📦 Building "${context.target.project}"`);
 
   const build = await context.scheduleTarget({
-      target: 'build',
-      project: context.target.project,
-      configuration: 'production'
-    },
-    options
-  );
+    target: 'build',
+    project: context.target.project,
+    configuration: 'production'
+  }, options);
   await build.result;
 
-  await run(projectRoot, options, context.logger as unknown as logging.LoggerApi);
+  await engine.run(
+    projectRoot,
+    options,
+    context.logger as unknown as logging.LoggerApi
+  );
 }

deploy/builder.ts

@@ -1,12 +1,11 @@
-import {
-  BuilderContext,
-  BuilderOutput,
-  createBuilder
-} from '@angular-devkit/architect';
+import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
-import deploy from './actions';
 import { experimental, join, normalize, json } from '@angular-devkit/core';
 import { Schema as RealDeployOptions } from './schema';
+
+import deploy from './actions';
+import * as engine from '../engine/engine';
+
 type DeployOptions = RealDeployOptions & json.JsonObject;
 
 // Call the createBuilder() function to create a builder. This mirrors
@@ -43,6 +42,7 @@ export default createBuilder<any>(
 
     try {
       await deploy(
+        engine,
         context,
         join(workspace.root, targets.build.options.outputPath),
         options