Test updates and fixes for Jest

ctrlo · Jan 24, 2025 · bca6579 · bca6579
1 parent 12887aa
commit bca6579
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 12 deletions.
diff --git a/src/frontend/components/button/lib/common.test.ts b/src/frontend/components/button/lib/common.test.ts
@@ -1,5 +1,6 @@
 import "../../../testing/globals.definitions";
 import {layoutId, recordId, table_key} from "./common";
+import {describe, it, expect} from "@jest/globals";
 
 describe("Common button tests",()=>{
     it("should populate table_key",()=>{

diff --git a/src/frontend/components/button/lib/remove-curval-button.test.ts b/src/frontend/components/button/lib/remove-curval-button.test.ts
@@ -2,6 +2,7 @@ import {jest, describe, it, expect, beforeAll, afterEach} from "@jest/globals";
 import createRemoveCurvalButton from "./remove-curval-button";
 
 describe("RemoveCurvalButton", ()=>{
+    // @ts-ignore
     window.confirm = jest.fn().mockReturnValue(true);
 
     beforeAll(()=>{

diff --git a/src/frontend/components/dashboard/lib/react/Dashboard/DashboardView.test.tsx b/src/frontend/components/dashboard/lib/react/Dashboard/DashboardView.test.tsx
@@ -4,8 +4,8 @@ import '@testing-library/dom';
 import { describe, it, expect, jest } from '@jest/globals';
 
 import DashboardView from './DashboardView';
-import { DashboardProps, WidgetProps } from '../types';
-import ReactGridLayout, { ReactGridLayoutProps } from 'react-grid-layout';
+import { WidgetProps } from '../types';
+import { ReactGridLayoutProps } from 'react-grid-layout';
 
 describe('DashboardView', () => {
     it('Creates a dashboard', () => {

diff --git a/src/frontend/js/lib/set-field-value.test.ts b/src/frontend/js/lib/set-field-value.test.ts
@@ -5,7 +5,7 @@ import buttonComponent from "../../components/button";
 import multipleSelectComponent from "../../components/form-group/multiple-select";
 import selectWidgetComponent from "../../components/form-group/select-widget";
 import textAreaComponent from "../../components/form-group/textarea";
-import { describe, it, expect } from '@jest/globals';
+import { describe, it, expect, jest, beforeEach } from '@jest/globals';
 import { setFieldValues } from "./set-field-values";
 
 declare global {
@@ -16,7 +16,9 @@ declare global {
 }
 
 (($)=>{
+    // @ts-ignore
     $.fn.renameButton = jest.fn().mockReturnThis();
+    // @ts-ignore
     $.fn.filedrag = jest.fn().mockReturnThis();
 })(jQuery);
 

diff --git a/src/frontend/js/lib/util/common.test.ts b/src/frontend/js/lib/util/common.test.ts
@@ -3,7 +3,7 @@ import { describe, it, expect, jest, beforeEach, afterEach } from "@jest/globals
 import { fromJson, hideElement, showElement, initJquery } from "./common";
 
 describe('common functions', () => {
-    describe.skip('CSS and ARIA - skipped as they are incorrect',()=>{
+    describe('CSS and ARIA - skipped as they are incorrect',()=>{
         let el: JQuery<HTMLElement>;
 
         beforeEach(() => {
@@ -78,12 +78,14 @@ describe('common functions', () => {
 
         it('returns an empty object for null', ()=>{
             const json = null;
+            // @ts-ignore
             const parsed = fromJson(json);
             expect(parsed).toEqual({});
         });
 
         it('returns an empty object for undefined', ()=>{
             const json = undefined;
+            // @ts-ignore
             const parsed = fromJson(json);
             expect(parsed).toEqual({});
         });

diff --git a/src/frontend/js/lib/util/common.ts b/src/frontend/js/lib/util/common.ts
@@ -1,5 +1,5 @@
 export const hideElement = (element: HTMLElement | JQuery<HTMLElement>) => {
-    const $el = $(element);
+    const $el = element instanceof HTMLElement ? $(element) : element;
     if($el.hasClass('hidden')) return;
     $el.addClass('hidden');
     $el.attr('aria-hidden', 'true');
@@ -8,7 +8,7 @@ export const hideElement = (element: HTMLElement | JQuery<HTMLElement>) => {
 };
 
 export const showElement = (element: HTMLElement |JQuery<HTMLElement>) => {
-    const $el = $(element);
+    const $el = element instanceof HTMLElement ? $(element) : element;
     if (!$el.hasClass('hidden')) return;
     $el.removeClass('hidden');
     $el.removeAttr('aria-hidden');

diff --git a/src/frontend/js/lib/util/encryptedStorage/lib/encryptedStorage.test.ts b/src/frontend/js/lib/util/encryptedStorage/lib/encryptedStorage.test.ts
@@ -1,5 +1,6 @@
-import { setupCrypto } from '../../../../../testing/globals.definitions';
+import { setupCrypto } from 'testing/globals.definitions';
 import { EncryptedStorage } from './encryptedStorage';
+import {describe, expect, beforeAll, beforeEach, afterEach, it} from "@jest/globals";
 
 class TestStorage implements Storage {
     private map = new Map<string, string>();

diff --git a/src/frontend/js/lib/util/gadsStorage/lib/AppStorage.test.ts b/src/frontend/js/lib/util/gadsStorage/lib/AppStorage.test.ts
@@ -1,9 +1,8 @@
-import "../../../../../testing/globals.definitions";
-import { describe, it, expect, jest } from "@jest/globals";
+import { describe, it, expect, jest, afterEach } from "@jest/globals";
 import { AppStorage } from "./AppStorage";
 import { GadsStorage } from "./GadsStorage";
 import { NullStorage } from "./NullStorage";
-import { setupCrypto } from "../../../../../testing/globals.definitions";
+import { setupCrypto } from "testing/globals.definitions";
 
 describe("AppStorage", () => {
     afterEach(() => {

diff --git a/src/frontend/js/lib/util/gadsStorage/lib/GadsStorage.test.ts b/src/frontend/js/lib/util/gadsStorage/lib/GadsStorage.test.ts
@@ -1,7 +1,6 @@
-import "../../../../../testing/globals.definitions";
 import { describe, it, expect, beforeAll, beforeEach, afterEach } from "@jest/globals";
 import { GadsStorage } from "./GadsStorage";
-import { killNoMockCrypto, setupCrypto, setupNoMockCrypto } from "../../../../../testing/globals.definitions";
+import { killNoMockCrypto, setupCrypto, setupNoMockCrypto } from "testing/globals.definitions";
 
 if (!process.versions.node.startsWith("18")) {
     describe("GadsStorage", () => {