From 4c4169e245e18e4a6cff3d2437c2848fb089f29d Mon Sep 17 00:00:00 2001
From: Simon Larsen <simonlarsen@oneuptime.com>
Date: Fri, 14 Jun 2024 14:24:45 +0100
Subject: [PATCH] refactor: Update import statements for jest in test files

---
 CommonServer/Tests/Middleware/UserAuthorization.test.ts  | 9 ++++++++-
 .../Tests/Services/AnalyticsDatabaseService.test.ts      | 9 ++++++++-
 CommonUI/src/Tests/Components/Item.test.tsx              | 3 +--
 CommonUI/src/Tests/Components/SideMenuItem.test.tsx      | 3 +--
 CommonUI/src/Tests/Components/Toggle.test.tsx            | 2 +-
 eslint.config.js                                         | 1 +
 6 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/CommonServer/Tests/Middleware/UserAuthorization.test.ts b/CommonServer/Tests/Middleware/UserAuthorization.test.ts
index 11ac498827..a20dcecd9d 100644
--- a/CommonServer/Tests/Middleware/UserAuthorization.test.ts
+++ b/CommonServer/Tests/Middleware/UserAuthorization.test.ts
@@ -24,7 +24,14 @@ import {
   UserTenantAccessPermission,
 } from "Common/Types/Permission";
 import Project from "Model/Models/Project";
-import { describe, expect, beforeEach, test, afterEach, jest } from "@jest/globals";
+import {
+  describe,
+  expect,
+  beforeEach,
+  test,
+  afterEach,
+  jest,
+} from "@jest/globals";
 
 jest.mock("../../Utils/Logger");
 jest.mock("../../Middleware/ProjectAuthorization");
diff --git a/CommonServer/Tests/Services/AnalyticsDatabaseService.test.ts b/CommonServer/Tests/Services/AnalyticsDatabaseService.test.ts
index cb5a83ba95..f33a5700ce 100644
--- a/CommonServer/Tests/Services/AnalyticsDatabaseService.test.ts
+++ b/CommonServer/Tests/Services/AnalyticsDatabaseService.test.ts
@@ -8,7 +8,14 @@ import AnalyticsTableEngine from "Common/Types/AnalyticsDatabase/AnalyticsTableE
 import AnalyticsTableColumn from "Common/Types/AnalyticsDatabase/TableColumn";
 import TableColumnType from "Common/Types/AnalyticsDatabase/TableColumnType";
 import GenericObject from "Common/Types/GenericObject";
-import { describe, expect, beforeEach, test, afterEach, jest } from "@jest/globals";
+import {
+  describe,
+  expect,
+  beforeEach,
+  test,
+  afterEach,
+  jest,
+} from "@jest/globals";
 
 describe("AnalyticsDatabaseService", () => {
   class TestModel extends AnalyticsBaseModel {
diff --git a/CommonUI/src/Tests/Components/Item.test.tsx b/CommonUI/src/Tests/Components/Item.test.tsx
index a692c02cf6..50ada24c90 100644
--- a/CommonUI/src/Tests/Components/Item.test.tsx
+++ b/CommonUI/src/Tests/Components/Item.test.tsx
@@ -1,12 +1,11 @@
 import { ButtonStyleType } from "../../Components/Button/Button";
 import Item, { ComponentProps } from "../../Components/OrderedStatesList/Item";
-import { describe, expect,  jest } from "@jest/globals";
+import { describe, expect, jest } from "@jest/globals";
 import "@testing-library/jest-dom";
 import { render } from "@testing-library/react";
 import IconProp from "Common/Types/Icon/IconProp";
 import React from "react";
 
-
 describe("Item component", () => {
   interface ItemData {
     id: number;
diff --git a/CommonUI/src/Tests/Components/SideMenuItem.test.tsx b/CommonUI/src/Tests/Components/SideMenuItem.test.tsx
index c754652918..68663b43f6 100644
--- a/CommonUI/src/Tests/Components/SideMenuItem.test.tsx
+++ b/CommonUI/src/Tests/Components/SideMenuItem.test.tsx
@@ -5,7 +5,7 @@ import SideMenuItem, {
   ComponentProps,
 } from "../../Components/SideMenu/SideMenuItem";
 import * as Navigation from "../../Utils/Navigation";
-import { describe, expect,afterEach, jest } from "@jest/globals";
+import { describe, expect, afterEach, jest } from "@jest/globals";
 import "@testing-library/jest-dom/extend-expect";
 import { fireEvent, render, screen } from "@testing-library/react";
 // Types
@@ -13,7 +13,6 @@ import Route from "Common/Types/API/Route";
 import IconProp from "Common/Types/Icon/IconProp";
 import React from "react";
 
-
 const highlightClassList: string =
   "bg-gray-100 text-indigo-600 hover:bg-white group rounded-md px-3 py-2 flex items-center text-sm font-medium";
 
diff --git a/CommonUI/src/Tests/Components/Toggle.test.tsx b/CommonUI/src/Tests/Components/Toggle.test.tsx
index 503bd20d1c..27ae7d85f7 100644
--- a/CommonUI/src/Tests/Components/Toggle.test.tsx
+++ b/CommonUI/src/Tests/Components/Toggle.test.tsx
@@ -2,7 +2,7 @@ import Toggle from "../../Components/Toggle/Toggle";
 import "@testing-library/jest-dom/extend-expect";
 import { fireEvent, render } from "@testing-library/react";
 import React from "react";
-import { describe, expect, beforeEach, test, afterEach, jest } from "@jest/globals";
+import { describe, expect, test, jest } from "@jest/globals";
 
 describe("Toggle", () => {
   test("renders toggle element with required props only", () => {
diff --git a/eslint.config.js b/eslint.config.js
index ee17f13410..8626f72711 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -194,6 +194,7 @@ export default tseslint.config(
       globals: {
         ...globals.browser,
         ...globals.node,
+        ...globals.jest,
         JSX: true,
       },
       parserOptions: {