Merge branch 'master' of github.com:spotify/backstage into scaffolder/new-templates

* 'master' of github.com:spotify/backstage:
  [Templates] Remove WIP label (#1665)
  README: Fix another broken link (#1664)
  [Docs] Fix relative paths to code (#1662)
  docs(scaffolder) tidy up some more docs (#1661)

plugins/scaffolder-backend/sample-templates/springboot-grpc-template/template.yaml

@@ -3,7 +3,7 @@ kind: Template
 metadata:
   name: springboot-template
   title: Spring Boot GRPC Service
-  description: Standard Spring Boot (Java) microservice with recommended configuration fpr GRPRC
+  description: Standard Spring Boot (Java) microservice with recommended configuration for GRPRC
   tags:
     - Recommended
     - Java

plugins/scaffolder-backend/src/scaffolder/stages/templater/helpers.test.ts

@@ -17,6 +17,7 @@ import Stream, { PassThrough } from 'stream';
 import os from 'os';
 import fs from 'fs';
 import Docker from 'dockerode';
+import { Writable } from 'stream';
 import { runDockerContainer } from './helpers';
 
 describe('helpers', () => {
@@ -26,9 +27,15 @@ describe('helpers', () => {
     jest
       .spyOn(mockDocker, 'run')
       .mockResolvedValue([{ Error: null, StatusCode: 0 }]);
-    jest
-      .spyOn(mockDocker, 'pull')
-      .mockResolvedValue([{ Error: null, StatusCode: 0 }]);
+    jest.spyOn(mockDocker, 'pull').mockImplementation((async (
+      _image: string,
+      _something: any,
+      handler: (err: Error | undefined, stream: Writable) => void,
+    ) => {
+      const mockStream = new Writable();
+      handler(undefined, mockStream);
+      mockStream.end();
+    }) as any);
   });
 
   describe('runDockerContainer', () => {