From f65b60d1014d029a8e34addc3b0a8285c8d76432 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Thu, 17 Feb 2022 15:24:35 +0100
Subject: [PATCH] chore: fixing broken tests

Signed-off-by: blam <ben@blam.sh>
---
 .../src/actions/fetch/rails/index.test.ts                  | 7 +++++--
 .../src/scaffolder/actions/builtin/fetch/template.test.ts  | 2 +-
 .../src/scaffolder/tasks/HandlebarsWorkflowRunner.test.ts  | 6 +++---
 .../src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts    | 6 +++---
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.test.ts b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.test.ts
index 0c7552f72f..0a6a996aa8 100644
--- a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.test.ts
+++ b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.test.ts
@@ -62,7 +62,10 @@ describe('fetch:rails', () => {
         help: 'me',
       },
     },
-    baseUrl: 'somebase',
+    templateInfo: {
+      baseUrl: 'somebase',
+      entityRef: 'template:default/myTemplate',
+    },
     workspacePath: mockTmpDir,
     logger: getVoidLogger(),
     logStream: new PassThrough(),
@@ -100,7 +103,7 @@ describe('fetch:rails', () => {
     expect(fetchContents).toHaveBeenCalledWith({
       reader: mockReader,
       integrations,
-      baseUrl: mockContext.baseUrl,
+      baseUrl: mockContext.templateInfo.baseUrl,
       fetchUrl: mockContext.input.url,
       outputPath: resolvePath(mockContext.workspacePath),
     });
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.test.ts
index 3f1b338965..8f641fe2e2 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.test.ts
@@ -202,7 +202,7 @@ describe('fetch:template', () => {
       it('uses fetchContents to retrieve the template content', () => {
         expect(mockFetchContents).toHaveBeenCalledWith(
           expect.objectContaining({
-            baseUrl: context.baseUrl,
+            baseUrl: context.templateInfo?.baseUrl,
             fetchUrl: context.input.url,
           }),
         );
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/HandlebarsWorkflowRunner.test.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/HandlebarsWorkflowRunner.test.ts
index 59a8bf9097..9f4135b3d1 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/HandlebarsWorkflowRunner.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/HandlebarsWorkflowRunner.test.ts
@@ -94,7 +94,7 @@ describe('LegacyWorkflowRunner', () => {
   });
 
   it('should pass metadata through', async () => {
-    const templateName = 'template name';
+    const entityRef = `template:default/templateName`;
     const task = createMockTaskWithSpec({
       apiVersion: 'backstage.io/v1beta2',
       steps: [
@@ -107,13 +107,13 @@ describe('LegacyWorkflowRunner', () => {
       ],
       output: {},
       values: {},
-      templateInfo: { entityRef: `template:default/${templateName}` },
+      templateInfo: { entityRef },
     });
 
     await runner.execute(task);
 
     expect(fakeActionHandler.mock.calls[0][0].templateInfo).toEqual({
-      name: templateName,
+      entityRef,
     });
   });
 
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts
index 43a5c180be..b66c69ee17 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts
@@ -163,7 +163,7 @@ describe('DefaultWorkflowRunner', () => {
     });
 
     it('should pass metadata through', async () => {
-      const templateName = 'template name';
+      const entityRef = `template:default/templateName`;
       const task = createMockTaskWithSpec({
         apiVersion: 'scaffolder.backstage.io/v1beta3',
         parameters: {},
@@ -176,13 +176,13 @@ describe('DefaultWorkflowRunner', () => {
             input: { foo: 1 },
           },
         ],
-        templateInfo: { entityRef: `template:default/${templateName}` },
+        templateInfo: { entityRef },
       });
 
       await runner.execute(task);
 
       expect(fakeActionHandler.mock.calls[0][0].templateInfo).toEqual({
-        name: templateName,
+        entityRef,
       });
     });