From 9c1ee4d56bd3952162bf7c43df5c4cc3f74f1de1 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Wed, 23 Mar 2022 13:41:38 +0100
Subject: [PATCH] chore: some small changes

Signed-off-by: blam <ben@blam.sh>
---
 ...eInstanceGithubCredentialsProvider.test.ts |  2 +-
 .../src/api/CatalogImportClient.test.ts       |  2 +-
 .../src/service/router.test.ts                | 25 ++++++++++---------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/packages/integration/src/github/SingleInstanceGithubCredentialsProvider.test.ts b/packages/integration/src/github/SingleInstanceGithubCredentialsProvider.test.ts
index d738edf417..1dcc45c1ef 100644
--- a/packages/integration/src/github/SingleInstanceGithubCredentialsProvider.test.ts
+++ b/packages/integration/src/github/SingleInstanceGithubCredentialsProvider.test.ts
@@ -25,7 +25,7 @@ const octokit = {
   },
 };
 
-jest.doMock('@octokit/rest', () => {
+jest.mock('@octokit/rest', () => {
   class Octokit {
     constructor() {
       return octokit;
diff --git a/plugins/catalog-import/src/api/CatalogImportClient.test.ts b/plugins/catalog-import/src/api/CatalogImportClient.test.ts
index 5a65738d61..98aea30638 100644
--- a/plugins/catalog-import/src/api/CatalogImportClient.test.ts
+++ b/plugins/catalog-import/src/api/CatalogImportClient.test.ts
@@ -37,7 +37,7 @@ const octokit = {
   },
 };
 
-jest.doMock('@octokit/rest', () => {
+jest.mock('@octokit/rest', () => {
   class Octokit {
     constructor() {
       return octokit;
diff --git a/plugins/scaffolder-backend/src/service/router.test.ts b/plugins/scaffolder-backend/src/service/router.test.ts
index e59f222e2d..7ddec46078 100644
--- a/plugins/scaffolder-backend/src/service/router.test.ts
+++ b/plugins/scaffolder-backend/src/service/router.test.ts
@@ -15,18 +15,6 @@
  */
 
 const mockAccess = jest.fn();
-jest.doMock('fs-extra', () => ({
-  access: mockAccess,
-  promises: {
-    access: mockAccess,
-  },
-  constants: {
-    F_OK: 0,
-    W_OK: 1,
-  },
-  mkdir: jest.fn(),
-  remove: jest.fn(),
-}));
 
 import {
   DatabaseManager,
@@ -55,6 +43,19 @@ import {
 import { createRouter, DatabaseTaskStore, TaskBroker } from '../index';
 import { StorageTaskBroker } from '../scaffolder/tasks/StorageTaskBroker';
 
+jest.mock('fs-extra', () => ({
+  access: mockAccess,
+  promises: {
+    access: mockAccess,
+  },
+  constants: {
+    F_OK: 0,
+    W_OK: 1,
+  },
+  mkdir: jest.fn(),
+  remove: jest.fn(),
+}));
+
 function createDatabase(): PluginDatabaseManager {
   return DatabaseManager.fromConfig(
     new ConfigReader({