From 658d6ab0e7c1c1b0a84f5c6f1cd214e9e6f03f59 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Fri, 3 Jun 2022 16:09:57 +0200
Subject: [PATCH] chore: fixing all tests

Signed-off-by: blam <ben@blam.sh>
---
 .../src/actions/fetch/cookiecutter.test.ts    | 22 ++++++++++++-------
 .../fetch/rails/railsNewRunner.test.ts        | 18 +++++++++------
 .../TechDocsReaderPageContent.test.tsx        | 22 -------------------
 3 files changed, 25 insertions(+), 37 deletions(-)

diff --git a/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.test.ts b/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.test.ts
index d8c9e06612..6ba83fdf77 100644
--- a/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.test.ts
+++ b/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.test.ts
@@ -13,16 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const executeShellCommand = jest.fn();
-const commandExists = jest.fn();
-const fetchContents = jest.fn();
 
-jest.doMock('@backstage/plugin-scaffolder-backend', () => ({
-  ...require('@backstage/plugin-scaffolder-backend'),
-  fetchContents,
-  executeShellCommand,
+jest.mock('@backstage/plugin-scaffolder-backend', () => ({
+  ...jest.requireActual('@backstage/plugin-scaffolder-backend'),
+  fetchContents: jest.fn(),
+  executeShellCommand: jest.fn(),
 }));
-jest.doMock('command-exists', () => commandExists);
+jest.mock('command-exists', () => jest.fn());
 
 import {
   getVoidLogger,
@@ -37,9 +34,18 @@ import os from 'os';
 import { PassThrough } from 'stream';
 import { createFetchCookiecutterAction } from './cookiecutter';
 import { join } from 'path';
+import {
+  fetchContents as fetchContentsMock,
+  executeShellCommand as executeShellCommandMock,
+} from '@backstage/plugin-scaffolder-backend';
 import type { ActionContext } from '@backstage/plugin-scaffolder-backend';
+import commandExistsMock from 'command-exists';
 
 describe('fetch:cookiecutter', () => {
+  const fetchContents = fetchContentsMock as jest.Mock;
+  const executeShellCommand = executeShellCommandMock as jest.Mock;
+  const commandExists = commandExistsMock as unknown as jest.Mock;
+
   const integrations = ScmIntegrations.fromConfig(
     new ConfigReader({
       integrations: {
diff --git a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsNewRunner.test.ts b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsNewRunner.test.ts
index 74640bafd0..7a3f3be722 100644
--- a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsNewRunner.test.ts
+++ b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsNewRunner.test.ts
@@ -13,24 +13,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import mockfs from 'mock-fs';
 
-const executeShellCommand = jest.fn();
-const commandExists = jest.fn();
-
-jest.doMock('@backstage/plugin-scaffolder-backend', () => ({
-  executeShellCommand,
+jest.mock('@backstage/plugin-scaffolder-backend', () => ({
+  executeShellCommand: jest.fn(),
 }));
-jest.doMock('command-exists', () => commandExists);
+jest.mock('command-exists', () => jest.fn());
+jest.mock('fs-extra');
 
 import { ContainerRunner } from '@backstage/backend-common';
 import fs from 'fs-extra';
+
 import path from 'path';
 import { PassThrough } from 'stream';
 
 import { RailsNewRunner } from './railsNewRunner';
 
+import { executeShellCommand as executeShellCommandMock } from '@backstage/plugin-scaffolder-backend';
+import commandExistsMock from 'command-exists';
+
 describe('Rails Templater', () => {
+  const executeShellCommand = executeShellCommandMock as jest.Mock;
+  const commandExists = commandExistsMock as unknown as jest.Mock;
+
   const containerRunner: jest.Mocked<ContainerRunner> = {
     runContainer: jest.fn(),
   };
diff --git a/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/TechDocsReaderPageContent.test.tsx b/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/TechDocsReaderPageContent.test.tsx
index a67eb7eedd..4b169d9b7d 100644
--- a/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/TechDocsReaderPageContent.test.tsx
+++ b/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/TechDocsReaderPageContent.test.tsx
@@ -112,28 +112,6 @@ describe('<TechDocsReaderPageContent />', () => {
     });
   });
 
-  it('should render progress if there is no dom and reader state is checking', async () => {
-    getEntityMetadata.mockResolvedValue(mockEntityMetadata);
-    getTechDocsMetadata.mockResolvedValue(mockTechDocsMetadata);
-    (useTechDocsReaderDom as jest.Mock).mockReturnValue(undefined);
-    (useReaderState as jest.Mock).mockReturnValue({ state: 'CHECKING' });
-
-    await act(async () => {
-      const rendered = await renderInTestApp(
-        <Wrapper>
-          <TechDocsReaderPageContent withSearch={false} />
-        </Wrapper>,
-      );
-
-      await waitFor(() => {
-        expect(
-          rendered.queryByTestId('techdocs-native-shadowroot'),
-        ).not.toBeInTheDocument();
-        expect(rendered.getByRole('progressbar')).toBeInTheDocument();
-      });
-    });
-  });
-
   it('should not render techdocs content if entity metadata is missing', async () => {
     getEntityMetadata.mockResolvedValue(undefined);
     (useTechDocsReaderDom as jest.Mock).mockReturnValue(