chore: [#1330] Fixes wrong imports in unit tests

capricorn86 · Mar 19, 2024 · 04be9be · 04be9be
1 parent 4edd575
commit 04be9be
Show file tree

Hide file tree

Showing 21 changed files with 11 additions and 38 deletions.
diff --git a/packages/happy-dom/test/css/declaration/CSSStyleDeclaration.test.ts b/packages/happy-dom/test/css/declaration/CSSStyleDeclaration.test.ts
@@ -1,6 +1,5 @@
 import CSSStyleDeclaration from '../../../src/css/declaration/CSSStyleDeclaration.js';
 import Window from '../../../src/window/Window.js';
-import Window from '../../../src/window/Window.js';
 import Document from '../../../src/nodes/document/Document.js';
 import HTMLElement from '../../../src/nodes/html-element/HTMLElement.js';
 import { beforeEach, describe, it, expect } from 'vitest';

diff --git a/packages/happy-dom/test/nodes/document/Document.test.ts b/packages/happy-dom/test/nodes/document/Document.test.ts
@@ -1,5 +1,4 @@
 import Window from '../../../src/window/Window.js';
-import Window from '../../../src/window/Window.js';
 import CustomElement from '../../CustomElement.js';
 import HTMLElement from '../../../src/nodes/html-element/HTMLElement.js';
 import Text from '../../../src/nodes/text/Text.js';
@@ -9,7 +8,6 @@ import NodeIterator from '../../../src/tree-walker/NodeIterator.js';
 import TreeWalker from '../../../src/tree-walker/TreeWalker.js';
 import Node from '../../../src/nodes/node/Node.js';
 import Document from '../../../src/nodes/document/Document.js';
-import Document from '../../../src/nodes/document/Document.js';
 import Element from '../../../src/nodes/element/Element.js';
 import Event from '../../../src/event/Event.js';
 import SVGSVGElement from '../../../src/nodes/svg-element/SVGSVGElement.js';
@@ -21,15 +19,12 @@ import QuerySelector from '../../../src/query-selector/QuerySelector.js';
 import NodeFilter from '../../../src/tree-walker/NodeFilter.js';
 import HTMLTemplateElement from '../../../src/nodes/html-template-element/HTMLTemplateElement.js';
 import HTMLCollection from '../../../src/nodes/element/HTMLCollection.js';
-import Element from '../../../src/nodes/element/Element.js';
 import NodeList from '../../../src/nodes/node/NodeList.js';
-import HTMLElement from '../../../src/nodes/html-element/HTMLElement.js';
 import HTMLLinkElement from '../../../src/nodes/html-link-element/HTMLLinkElement.js';
 import Response from '../../../src/fetch/Response.js';
 import ResourceFetch from '../../../src/fetch/ResourceFetch.js';
 import HTMLScriptElement from '../../../src/nodes/html-script-element/HTMLScriptElement.js';
 import DocumentReadyStateEnum from '../../../src/nodes/document/DocumentReadyStateEnum.js';
-import SVGElement from '../../../src/nodes/svg-element/SVGElement.js';
 import CustomEvent from '../../../src/event/events/CustomEvent.js';
 import Selection from '../../../src/selection/Selection.js';
 import Range from '../../../src/range/Range.js';
@@ -455,8 +450,8 @@ describe('Document', () => {
 
 			const button = <HTMLElement>(
 				(<HTMLElement>(
-					customElementA.shadowRoot.querySelector('custom-element-b')
-				)).shadowRoot.querySelector('button')
+					customElementA.shadowRoot?.querySelector('custom-element-b')
+				)).shadowRoot?.querySelector('button')
 			);
 
 			let focusCalls = 0;

diff --git a/packages/happy-dom/test/nodes/element/Element.test.ts b/packages/happy-dom/test/nodes/element/Element.test.ts
@@ -1,5 +1,4 @@
 import Window from '../../../src/window/Window.js';
-import Window from '../../../src/window/Window.js';
 import XMLSerializer from '../../../src/xml-serializer/XMLSerializer.js';
 import XMLParser from '../../../src/xml-parser/XMLParser.js';
 import CustomElement from '../../CustomElement.js';
@@ -16,12 +15,10 @@ import HTMLTemplateElement from '../../../src/nodes/html-template-element/HTMLTe
 import Node from '../../../src/nodes/node/Node.js';
 import HTMLCollection from '../../../src/nodes/element/HTMLCollection.js';
 import Element from '../../../src/nodes/element/Element.js';
-import Element from '../../../src/nodes/element/Element.js';
 import NodeList from '../../../src/nodes/node/NodeList.js';
 import Attr from '../../../src/nodes/attr/Attr.js';
 import Event from '../../../src/event/Event.js';
 import { beforeEach, afterEach, describe, it, expect, vi } from 'vitest';
-import Node from '../../../src/nodes/node/Node.js';
 import * as PropertySymbol from '../../../src/PropertySymbol.js';
 
 const NAMESPACE_URI = 'https://test.test';
@@ -349,7 +346,7 @@ describe('Element', () => {
 			const text2 = document.createTextNode('text2');
 
 			for (const node of document.childNodes.slice()) {
-				node.parentNode.removeChild(node);
+				node.parentNode?.removeChild(node);
 			}
 
 			div.appendChild(text1);
@@ -370,7 +367,7 @@ describe('Element', () => {
 			const text2 = document.createTextNode('text2');
 
 			for (const node of document.childNodes.slice()) {
-				node.parentNode.removeChild(node);
+				node.parentNode?.removeChild(node);
 			}
 
 			div.appendChild(text1);
@@ -838,7 +835,7 @@ describe('Element', () => {
 			vi.spyOn(QuerySelector, 'querySelectorAll').mockImplementation((parentNode, selector) => {
 				expect(parentNode).toBe(document);
 				expect(selector).toEqual(expectedSelector);
-				return <NodeList<Element>>[element];
+				return <NodeList<Element>>(<unknown>[element]);
 			});
 
 			const result = document.querySelectorAll(expectedSelector);
@@ -1466,20 +1463,20 @@ describe('Element', () => {
 			element.attachShadow({ mode: 'open' });
 			expect(element[PropertySymbol.shadowRoot] instanceof ShadowRoot).toBe(true);
 			expect(element.shadowRoot instanceof ShadowRoot).toBe(true);
-			expect(element.shadowRoot.ownerDocument === document).toBe(true);
-			expect(element.shadowRoot.isConnected).toBe(false);
+			expect(element.shadowRoot?.ownerDocument === document).toBe(true);
+			expect(element.shadowRoot?.isConnected).toBe(false);
 			document.appendChild(element);
-			expect(element.shadowRoot.isConnected).toBe(true);
+			expect(element.shadowRoot?.isConnected).toBe(true);
 		});
 
 		it('Creates a new closed ShadowRoot node and sets it to the internal "[PropertySymbol.shadowRoot]" property.', () => {
 			element.attachShadow({ mode: 'closed' });
 			expect(element.shadowRoot).toBe(null);
 			expect(element[PropertySymbol.shadowRoot] instanceof ShadowRoot).toBe(true);
-			expect(element[PropertySymbol.shadowRoot].ownerDocument === document).toBe(true);
-			expect(element[PropertySymbol.shadowRoot].isConnected).toBe(false);
+			expect(element[PropertySymbol.shadowRoot]?.ownerDocument === document).toBe(true);
+			expect(element[PropertySymbol.shadowRoot]?.isConnected).toBe(false);
 			document.appendChild(element);
-			expect(element[PropertySymbol.shadowRoot].isConnected).toBe(true);
+			expect(element[PropertySymbol.shadowRoot]?.isConnected).toBe(true);
 		});
 	});
 

diff --git a/packages/happy-dom/test/nodes/html-anchor-element/HTMLAnchorElement.test.ts b/packages/happy-dom/test/nodes/html-anchor-element/HTMLAnchorElement.test.ts
@@ -1,5 +1,4 @@
 import Window from '../../../src/window/Window.js';
-import Window from '../../../src/window/Window.js';
 import Document from '../../../src/nodes/document/Document.js';
 import HTMLAnchorElement from '../../../src/nodes/html-anchor-element/HTMLAnchorElement.js';
 import { beforeEach, describe, it, expect, vi } from 'vitest';

diff --git a/packages/happy-dom/test/nodes/html-base-element/HTMLBaseElement.test.ts b/packages/happy-dom/test/nodes/html-base-element/HTMLBaseElement.test.ts
@@ -1,5 +1,4 @@
 import Window from '../../../src/window/Window.js';
-import Window from '../../../src/window/Window.js';
 import Document from '../../../src/nodes/document/Document.js';
 import HTMLBaseElement from '../../../src/nodes/html-base-element/HTMLBaseElement.js';
 import { beforeEach, afterEach, describe, it, expect } from 'vitest';

diff --git a/packages/happy-dom/test/nodes/html-dialog-element/HTMLDialogElement.test.ts b/packages/happy-dom/test/nodes/html-dialog-element/HTMLDialogElement.test.ts
@@ -1,7 +1,6 @@
 import Event from '../../../src/event/Event.js';
 import HTMLDialogElement from '../../../src/nodes/html-dialog-element/HTMLDialogElement.js';
 import Window from '../../../src/window/Window.js';
-import Window from '../../../src/window/Window.js';
 import Document from '../../../src/nodes/document/Document.js';
 import { beforeEach, describe, it, expect } from 'vitest';
 

diff --git a/packages/happy-dom/test/nodes/html-element/HTMLElement.test.ts b/packages/happy-dom/test/nodes/html-element/HTMLElement.test.ts
@@ -5,7 +5,6 @@ import HTMLElementUtility from '../../../src/nodes/html-element/HTMLElementUtili
 import HTMLElement from '../../../src/nodes/html-element/HTMLElement.js';
 import SVGElement from '../../../src/nodes/svg-element/SVGElement.js';
 import Window from '../../../src/window/Window.js';
-import Window from '../../../src/window/Window.js';
 import CustomElement from '../../CustomElement.js';
 import * as PropertySymbol from '../../../src/PropertySymbol.js';
 import CustomElementRegistry from '../../../src/custom-element/CustomElementRegistry.js';

diff --git a/packages/happy-dom/test/nodes/html-element/HTMLElementUtility.test.ts b/packages/happy-dom/test/nodes/html-element/HTMLElementUtility.test.ts
@@ -3,7 +3,6 @@ import FocusEvent from '../../../src/event/events/FocusEvent.js';
 import Document from '../../../src/nodes/document/Document.js';
 import HTMLElement from '../../../src/nodes/html-element/HTMLElement.js';
 import Window from '../../../src/window/Window.js';
-import Window from '../../../src/window/Window.js';
 import { beforeEach, describe, it, expect } from 'vitest';
 
 describe('HTMLElementUtility', () => {

diff --git a/packages/happy-dom/test/nodes/html-input-element/FileList.test.ts b/packages/happy-dom/test/nodes/html-input-element/FileList.test.ts
@@ -1,5 +1,4 @@
 import Window from '../../../src/window/Window.js';
-import Window from '../../../src/window/Window.js';
 import Document from '../../../src/nodes/document/Document.js';
 import File from '../../../src/file/File.js';
 import HTMLInputElement from '../../../src/nodes/html-input-element/HTMLInputElement.js';

diff --git a/packages/happy-dom/test/nodes/html-input-element/HTMLInputElement.test.ts b/packages/happy-dom/test/nodes/html-input-element/HTMLInputElement.test.ts
@@ -1,5 +1,4 @@
 import Window from '../../../src/window/Window.js';
-import Window from '../../../src/window/Window.js';
 import Document from '../../../src/nodes/document/Document.js';
 import HTMLInputElement from '../../../src/nodes/html-input-element/HTMLInputElement.js';
 import DOMException from '../../../src/exception/DOMException.js';

diff --git a/packages/happy-dom/test/nodes/html-input-element/HTMLInputElementValueSanitizer.test.ts b/packages/happy-dom/test/nodes/html-input-element/HTMLInputElementValueSanitizer.test.ts
@@ -1,5 +1,4 @@
 import Window from '../../../src/window/Window.js';
-import Window from '../../../src/window/Window.js';
 import Document from '../../../src/nodes/document/Document.js';
 import HTMLInputElement from '../../../src/nodes/html-input-element/HTMLInputElement.js';
 import HTMLInputElementValueSanitizer from '../../../src/nodes/html-input-element/HTMLInputElementValueSanitizer.js';

diff --git a/packages/happy-dom/test/nodes/html-link-element/HTMLLinkElement.test.ts b/packages/happy-dom/test/nodes/html-link-element/HTMLLinkElement.test.ts
@@ -1,5 +1,4 @@
 import Window from '../../../src/window/Window.js';
-import Window from '../../../src/window/Window.js';
 import BrowserWindow from '../../../src/window/BrowserWindow.js';
 import Document from '../../../src/nodes/document/Document.js';
 import HTMLLinkElement from '../../../src/nodes/html-link-element/HTMLLinkElement.js';

diff --git a/packages/happy-dom/test/nodes/html-media-element/HTMLMediaElement.test.ts b/packages/happy-dom/test/nodes/html-media-element/HTMLMediaElement.test.ts
@@ -1,5 +1,4 @@
 import Window from '../../../src/window/Window.js';
-import Window from '../../../src/window/Window.js';
 import DOMException from '../../../src/exception/DOMException.js';
 import DOMExceptionNameEnum from '../../../src/exception/DOMExceptionNameEnum.js';
 import Document from '../../../src/nodes/document/Document.js';

diff --git a/packages/happy-dom/test/nodes/html-option-element/HTMLOptionsCollection.test.ts b/packages/happy-dom/test/nodes/html-option-element/HTMLOptionsCollection.test.ts
@@ -1,5 +1,4 @@
 import Window from '../../../src/window/Window.js';
-import Window from '../../../src/window/Window.js';
 import Document from '../../../src/nodes/document/Document.js';
 import HTMLSelectElement from '../../../src/nodes/html-select-element/HTMLSelectElement.js';
 import HTMLOptionElement from '../../../src/nodes/html-option-element/HTMLOptionElement.js';

diff --git a/packages/happy-dom/test/nodes/html-select-element/HTMLSelectElement.test.ts b/packages/happy-dom/test/nodes/html-select-element/HTMLSelectElement.test.ts
@@ -1,5 +1,4 @@
 import Window from '../../../src/window/Window.js';
-import Window from '../../../src/window/Window.js';
 import Document from '../../../src/nodes/document/Document.js';
 import HTMLSelectElement from '../../../src/nodes/html-select-element/HTMLSelectElement.js';
 import HTMLOptionElement from '../../../src/nodes/html-option-element/HTMLOptionElement.js';

diff --git a/packages/happy-dom/test/nodes/html-style-element/HTMLStyleElement.test.ts b/packages/happy-dom/test/nodes/html-style-element/HTMLStyleElement.test.ts
@@ -1,5 +1,4 @@
 import Window from '../../../src/window/Window.js';
-import Window from '../../../src/window/Window.js';
 import Document from '../../../src/nodes/document/Document.js';
 import HTMLStyleElement from '../../../src/nodes/html-style-element/HTMLStyleElement.js';
 import { beforeEach, describe, it, expect } from 'vitest';

diff --git a/packages/happy-dom/test/nodes/html-template-element/HTMLTemplateElement.test.ts b/packages/happy-dom/test/nodes/html-template-element/HTMLTemplateElement.test.ts
@@ -1,5 +1,4 @@
 import Window from '../../../src/window/Window.js';
-import Window from '../../../src/window/Window.js';
 import Document from '../../../src/nodes/document/Document.js';
 import HTMLTemplateElement from '../../../src/nodes/html-template-element/HTMLTemplateElement.js';
 import XMLSerializer from '../../../src/xml-serializer/XMLSerializer.js';

diff --git a/packages/happy-dom/test/nodes/html-text-area-element/HTMLTextAreaElement.test.ts b/packages/happy-dom/test/nodes/html-text-area-element/HTMLTextAreaElement.test.ts
@@ -1,5 +1,4 @@
 import Window from '../../../src/window/Window.js';
-import Window from '../../../src/window/Window.js';
 import Document from '../../../src/nodes/document/Document.js';
 import HTMLTextAreaElement from '../../../src/nodes/html-text-area-element/HTMLTextAreaElement.js';
 import HTMLInputElementSelectionModeEnum from '../../../src/nodes/html-input-element/HTMLInputElementSelectionModeEnum.js';

diff --git a/packages/happy-dom/test/nodes/node/Node.test.ts b/packages/happy-dom/test/nodes/node/Node.test.ts
@@ -1,5 +1,4 @@
 import Window from '../../../src/window/Window.js';
-import Window from '../../../src/window/Window.js';
 import Document from '../../../src/nodes/document/Document.js';
 import Node from '../../../src/nodes/node/Node.js';
 import HTMLElement from '../../../src/nodes/html-element/HTMLElement.js';

diff --git a/packages/happy-dom/test/nodes/node/NodeUtility.test.ts b/packages/happy-dom/test/nodes/node/NodeUtility.test.ts
@@ -1,5 +1,4 @@
 import Window from '../../../src/window/Window.js';
-import Window from '../../../src/window/Window.js';
 import Document from '../../../src/nodes/document/Document.js';
 import NodeUtility from '../../../src/nodes/node/NodeUtility.js';
 import NodeTypeEnum from '../../../src/nodes/node/NodeTypeEnum.js';

diff --git a/packages/happy-dom/test/xml-http-request/XMLHttpRequest.test.ts b/packages/happy-dom/test/xml-http-request/XMLHttpRequest.test.ts
@@ -11,7 +11,6 @@ import Response from '../../src/fetch/Response.js';
 import ISyncResponse from '../../src/fetch/types/ISyncResponse.js';
 import Fetch from '../../src/fetch/Fetch.js';
 import Headers from '../../src/fetch/Headers.js';
-import Headers from '../../src/fetch/Headers.js';
 import DOMException from '../../src/exception/DOMException.js';
 import DOMExceptionNameEnum from '../../src/exception/DOMExceptionNameEnum.js';
 import { ReadableStream } from 'stream/web';