In tests, import code under test by name instead of relative pa… (#2086)

In tests, import code under test by name instead of relative path

compat/test/browser/Children.test.js

@@ -3,9 +3,8 @@ import {
 	teardown,
 	serializeHtml
 } from '../../../test/_util/helpers';
-// eslint-disable-next-line no-unused-vars
-import React, { Children, render } from '../../src';
 import { div, span } from '../../../test/_util/dom';
+import React, { createElement, Children, render } from 'preact/compat';
 
 describe('Children', () => {
 	/** @type {HTMLDivElement} */

compat/test/browser/compat.test.js

@@ -1,7 +1,7 @@
-import { createElement, render } from 'preact';
+import { render } from 'preact';
 import { setupScratch, teardown } from '../../../test/_util/helpers';
 
-import React from 'preact/compat'; // eslint-disable-line
+import React, { createElement } from 'preact/compat';
 
 describe('imported compat in preact', () => {
 	let scratch;

compat/test/browser/component.test.js

@@ -1,6 +1,6 @@
 import { setupRerender } from 'preact/test-utils';
 import { setupScratch, teardown } from '../../../test/_util/helpers';
-import React from '../../src';
+import React, { createElement } from 'preact/compat';
 
 describe('components', () => {
 	/** @type {HTMLDivElement} */

compat/test/browser/exports.test.js

@@ -1,6 +1,6 @@
-import Compat from '../../src';
+import Compat from 'preact/compat';
 // eslint-disable-next-line no-duplicate-imports
-import * as Named from '../../src';
+import * as Named from 'preact/compat';
 
 describe('exports', () => {
 	it('should have a default export', () => {

compat/test/browser/forwardRef.test.js

@@ -1,5 +1,5 @@
-import {
-	createElement as h,
+import React, {
+	createElement,
 	render,
 	createRef,
 	forwardRef,
@@ -8,12 +8,12 @@ import {
 	useState,
 	useRef,
 	useImperativeHandle
-} from '../../src';
+} from 'preact/compat';
 import { setupScratch, teardown } from '../../../test/_util/helpers';
 import { setupRerender, act } from 'preact/test-utils';
+
 /* eslint-disable react/jsx-boolean-value, react/display-name, prefer-arrow-callback */
 
-/** @jsx h */
 describe('forwardRef', () => {
 	/** @type {HTMLDivElement} */
 	let scratch, rerender;

compat/test/browser/index.test.js

@@ -7,7 +7,7 @@ import React, {
 	unmountComponentAtNode,
 	createFactory,
 	unstable_batchedUpdates
-} from '../../src';
+} from 'preact/compat';
 import { createElement as preactH } from 'preact';
 import {
 	setupScratch,

compat/test/browser/jsx.test.js

@@ -3,8 +3,8 @@ import {
 	teardown,
 	serializeHtml
 } from '../../../test/_util/helpers';
-import React, { isValidElement } from '../../src';
-import { h as preactH } from 'preact';
+import React, { createElement, isValidElement } from 'preact/compat';
+import { createElement as preactH } from 'preact';
 
 describe('jsx', () => {
 	/** @type {HTMLDivElement} */

compat/test/browser/memo.test.js

@@ -1,8 +1,8 @@
 import { setupRerender } from 'preact/test-utils';
 import { setupScratch, teardown } from '../../../test/_util/helpers';
-import { Component, render, createElement as h, memo } from '../../src';
+import React, { createElement, Component, render, memo } from 'preact/compat';
 
-/** @jsx h */
+const h = React.createElement;
 
 describe('memo()', () => {
 	let scratch, rerender;

compat/test/browser/options-compat.test.js

@@ -1,14 +1,17 @@
 import { vnodeSpy, eventSpy } from '../../../test/_util/optionSpies';
-import { render, createElement, Component, createRef } from '../../src';
+import React, {
+	createElement,
+	render,
+	Component,
+	createRef
+} from 'preact/compat';
 import { setupRerender } from 'preact/test-utils';
 import {
 	setupScratch,
 	teardown,
 	createEvent
 } from '../../../test/_util/helpers';
 
-/** @jsx createElement */
-
 describe('compat options', () => {
 	/** @type {HTMLDivElement} */
 	let scratch;

compat/test/browser/portals.test.js

@@ -1,15 +1,15 @@
-import {
-	createElement as h,
+import React, {
+	createElement,
 	render,
 	createPortal,
 	useState,
 	Component
-} from '../../src';
+} from 'preact/compat';
 import { setupScratch, teardown } from '../../../test/_util/helpers';
 import { setupRerender } from 'preact/test-utils';
+
 /* eslint-disable react/jsx-boolean-value, react/display-name, prefer-arrow-callback */
 
-/** @jsx h */
 describe('Portal', () => {
 	/** @type {HTMLDivElement} */
 	let scratch;

compat/test/browser/select.test.js

@@ -1,7 +1,5 @@
 import { setupScratch, teardown } from '../../../test/_util/helpers';
-import { render, createElement as h } from '../../src';
-
-/** @jsx h */
+import React, { createElement, render } from 'preact/compat';
 
 describe('Select', () => {
 	let scratch;

compat/test/browser/suspense.test.js

@@ -1,16 +1,17 @@
-/* eslint-env browser, mocha */
-/** @jsx h */
 import { setupRerender } from 'preact/test-utils';
-import {
-	createElement as h,
+import React, {
+	createElement,
 	render,
 	Component,
 	Suspense,
 	lazy,
 	Fragment
-} from '../../src/index';
+} from 'preact/compat';
 import { setupScratch, teardown } from '../../../test/_util/helpers';
 
+const h = React.createElement;
+/* eslint-env browser, mocha */
+
 function createLazy() {
 	/** @type {(c: ComponentType) => Promise<void>} */
 	let resolver, rejecter;
@@ -40,7 +41,7 @@ function createLazy() {
  * @returns {[typeof Component, () => Resolvers]}
  */
 function createSuspender(DefaultComponent) {
-	/** @type {(lazy: h.JSX.Element) => void} */
+	/** @type {(lazy: React.JSX.Element) => void} */
 	let renderLazy;
 	class Suspender extends Component {
 		constructor(props, context) {

compat/test/browser/svg.test.js

@@ -1,4 +1,4 @@
-import React from '../../src';
+import React, { createElement } from 'preact/compat';
 import {
 	setupScratch,
 	teardown,

debug/test/browser/debug-hooks.test.js

@@ -6,14 +6,12 @@ import {
 	useMemo,
 	useCallback
 } from 'preact/hooks';
-import { initDebug } from '../../src/debug';
+import 'preact/debug';
 import { act } from 'preact/test-utils';
 import { setupScratch, teardown } from '../../../test/_util/helpers';
 
 /** @jsx createElement */
 
-initDebug();
-
 describe('debug with hooks', () => {
 	let scratch;
 	let errors = [];

debug/test/browser/debug-suspense.test.js

@@ -1,5 +1,5 @@
 import { createElement, render, lazy, Suspense } from 'preact/compat';
-import { initDebug } from '../../src/debug';
+import 'preact/debug';
 import { setupRerender } from 'preact/test-utils';
 import {
 	setupScratch,
@@ -9,8 +9,6 @@ import {
 
 /** @jsx createElement */
 
-initDebug();
-
 describe('debug with suspense', () => {
 	let scratch;
 	let errors = [];

debug/test/browser/debug.test.js

@@ -1,21 +1,14 @@
-import {
-	createElement as h,
-	render,
-	createRef,
-	Component,
-	Fragment
-} from 'preact';
+import { createElement, render, createRef, Component, Fragment } from 'preact';
 import {
 	setupScratch,
 	teardown,
 	serializeHtml
 } from '../../../test/_util/helpers';
-import { serializeVNode, initDebug } from '../../src/debug';
+import 'preact/debug';
 import * as PropTypes from 'prop-types';
 
-initDebug();
-
-/** @jsx h */
+const h = createElement;
+/** @jsx createElement */
 
 describe('debug', () => {
 	let scratch;
@@ -325,66 +318,6 @@ describe('debug', () => {
 		});
 	});
 
-	describe('serializeVNode', () => {
-		it("should prefer a function component's displayName", () => {
-			function Foo() {
-				return <div />;
-			}
-			Foo.displayName = 'Bar';
-
-			expect(serializeVNode(<Foo />)).to.equal('<Bar />');
-		});
-
-		it("should prefer a class component's displayName", () => {
-			class Bar extends Component {
-				render() {
-					return <div />;
-				}
-			}
-			Bar.displayName = 'Foo';
-
-			expect(serializeVNode(<Bar />)).to.equal('<Foo />');
-		});
-
-		it('should serialize vnodes without children', () => {
-			expect(serializeVNode(<br />)).to.equal('<br />');
-		});
-
-		it('should serialize vnodes with children', () => {
-			expect(serializeVNode(<div>Hello World</div>)).to.equal('<div>..</div>');
-		});
-
-		it('should serialize components', () => {
-			function Foo() {
-				return <div />;
-			}
-			expect(serializeVNode(<Foo />)).to.equal('<Foo />');
-		});
-
-		it('should serialize props', () => {
-			expect(serializeVNode(<div class="foo" />)).to.equal(
-				'<div class="foo" />'
-			);
-
-			let noop = () => {};
-			expect(serializeVNode(<div onClick={noop} />)).to.equal(
-				'<div onClick="function noop() {}" />'
-			);
-
-			function Foo(props) {
-				return props.foo;
-			}
-
-			expect(serializeVNode(<Foo foo={[1, 2, 3]} />)).to.equal(
-				'<Foo foo="1,2,3" />'
-			);
-
-			expect(serializeVNode(<div prop={Object.create(null)} />)).to.equal(
-				'<div prop="[object Object]" />'
-			);
-		});
-	});
-
 	describe('table markup', () => {
 		it('missing <tbody>/<thead>/<tfoot>/<table>', () => {
 			const Table = () => (

debug/test/browser/options-debug.test.js

@@ -10,7 +10,7 @@ import {
 import { createElement, render, Component } from 'preact';
 import { useState } from 'preact/hooks';
 import { setupRerender } from 'preact/test-utils';
-import { initDebug } from '../../src/debug';
+import 'preact/debug';
 import { setupScratch, teardown } from '../../../test/_util/helpers';
 
 /** @jsx createElement */
@@ -25,10 +25,6 @@ describe('debug options', () => {
 	/** @type {(count: number) => void} */
 	let setCount;
 
-	before(() => {
-		initDebug();
-	});
-
 	beforeEach(() => {
 		scratch = setupScratch();
 		rerender = setupRerender();

debug/test/browser/options-devtools.test.js

@@ -9,7 +9,7 @@ import {
 import { createElement, render, Component } from 'preact';
 import { useState } from 'preact/hooks';
 import { setupRerender } from 'preact/test-utils';
-import { initDebug } from '../../src/debug';
+import { initDevTools } from '../../src/devtools';
 import { setupScratch, teardown } from '../../../test/_util/helpers';
 
 /** @jsx createElement */
@@ -25,7 +25,7 @@ describe('devtools options', () => {
 	let setCount;
 
 	before(() => {
-		initDebug();
+		initDevTools();
 	});
 
 	beforeEach(() => {