From f2d01c5cb4fe529ee48f99f025bbd9c608d0c775 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Fri, 26 Jun 2020 14:19:13 +0200
Subject: [PATCH] chore(scaffolder): adding some more tests for scaffolder
 processor

---
 .../src/scaffolder/jobs/processor.test.ts     | 21 ++++++++++++++++++-
 .../src/scaffolder/jobs/processor.ts          |  2 +-
 .../scaffolder/templater/cookiecutter.test.ts |  1 +
 .../scaffolder-backend/src/service/router.ts  |  8 +++----
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/plugins/scaffolder-backend/src/scaffolder/jobs/processor.test.ts b/plugins/scaffolder-backend/src/scaffolder/jobs/processor.test.ts
index 49b5ef7f54..8c3643b10b 100644
--- a/plugins/scaffolder-backend/src/scaffolder/jobs/processor.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/jobs/processor.test.ts
@@ -15,6 +15,10 @@
  */
 import { JobProcessor } from './processor';
 import { TemplateEntityV1alpha1 } from '@backstage/catalog-model';
+import Docker from 'dockerode';
+import { CookieCutter } from '../templater/cookiecutter';
+import { Preparers } from '../';
+
 describe('JobProcessor', () => {
   const mockEntity: TemplateEntityV1alpha1 = {
     apiVersion: 'backstage.io/v1alpha1',
@@ -40,7 +44,22 @@ describe('JobProcessor', () => {
   };
 
   describe('create', () => {
-    it.todo('creates a new job');
+    const templater = new CookieCutter();
+    const preparers = new Preparers();
+    const mockDocker = {} as jest.Mocked<Docker>;
+    it('creates a new job', async () => {
+      const processor = new JobProcessor({
+        dockerClient: mockDocker,
+        preparers,
+        templater,
+      });
+
+      const job = processor.create(mockEntity, { component_id: 'bob' });
+
+      expect(job.id).toMatch(
+        /^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i,
+      );
+    });
   });
 
   describe('process', () => {
diff --git a/plugins/scaffolder-backend/src/scaffolder/jobs/processor.ts b/plugins/scaffolder-backend/src/scaffolder/jobs/processor.ts
index 4e90b457a7..341ae6724e 100644
--- a/plugins/scaffolder-backend/src/scaffolder/jobs/processor.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/jobs/processor.ts
@@ -17,7 +17,7 @@ import { Processor, Job } from './types';
 import { JsonValue } from '@backstage/config';
 import { TemplateEntityV1alpha1 } from '@backstage/catalog-model';
 import { PassThrough } from 'stream';
-import uuid from 'uuid';
+import * as uuid from 'uuid';
 import Docker from 'dockerode';
 import winston from 'winston';
 import { RequiredTemplateValues, TemplaterBase } from '../templater';
diff --git a/plugins/scaffolder-backend/src/scaffolder/templater/cookiecutter.test.ts b/plugins/scaffolder-backend/src/scaffolder/templater/cookiecutter.test.ts
index f31dd7cdd0..82e84bc1d3 100644
--- a/plugins/scaffolder-backend/src/scaffolder/templater/cookiecutter.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/templater/cookiecutter.test.ts
@@ -105,6 +105,7 @@ describe('CookieCutter Templater', () => {
       dockerClient: mockDocker,
     });
   });
+
   it('should return the result path to the end templated folder', async () => {
     const tempdir = os.tmpdir();
 
diff --git a/plugins/scaffolder-backend/src/service/router.ts b/plugins/scaffolder-backend/src/service/router.ts
index 4d64bc159f..5957b66915 100644
--- a/plugins/scaffolder-backend/src/service/router.ts
+++ b/plugins/scaffolder-backend/src/service/router.ts
@@ -38,7 +38,6 @@ export async function createRouter(
   const jobProcessor = new JobProcessor({
     preparers,
     templater,
-    logger,
     dockerClient,
   });
 
@@ -47,7 +46,8 @@ export async function createRouter(
       const job = jobProcessor.get(params.jobId);
 
       if (!job) {
-        return res.status(404).send({ error: 'job not found' });
+        res.status(404).send({ error: 'job not found' });
+        return;
       }
 
       res.send({
@@ -89,9 +89,7 @@ export async function createRouter(
       const job = jobProcessor.create(mockEntity, { component_id: 'test' });
       res.status(201).json({ jobId: job.id });
 
-      jobProcessor.run(job);
-
-      // console.warn(templatedPath);
+      jobProcessor.process(job);
     });
 
   const app = express();