correct tests

preactjs · Aug 27, 2022 · 45b80c0 · 45b80c0
1 parent b81478c
commit 45b80c0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/src/diff/index.js b/src/diff/index.js
@@ -477,6 +477,7 @@ function diffElementNodes(
  */
 export function applyRef(ref, value, vnode) {
 	try {
+		console.log('applying ref', value);
 		if (typeof ref == 'function') ref(value);
 		else ref.current = value;
 	} catch (e) {
@@ -497,7 +498,9 @@ export function unmount(vnode, parentVNode, skipRemove) {
 	if (options.unmount) options.unmount(vnode);
 
 	if ((r = vnode.ref)) {
-		if (!r.current || r.current === vnode._dom) applyRef(r, null, parentVNode);
+		if (!r.current || r.current === vnode._dom) {
+			applyRef(r, null, parentVNode);
+		}
 	}
 
 	if ((r = vnode._component) != null) {

diff --git a/test/browser/refs.test.js b/test/browser/refs.test.js
@@ -509,21 +509,24 @@ describe('refs', () => {
 		expect(ref.current).to.equal(scratch.firstChild.firstChild);
 	});
 
-	it('should properly call null for memoized components keyed', () => {
+	it.only('should properly call null for memoized components keyed', () => {
 		const calls = [];
 		const element = <div ref={x => calls.push(x)}>hey</div>;
 		function App(props) {
 			return <div key={props.count}>{element}</div>;
 		}
 
 		render(<App count={0} />, scratch);
-		expect(calls[0]).to.equal(scratch.firstChild.firstChild);
 		render(<App count={1} />, scratch);
-		expect(calls[1]).to.equal(null);
-		expect(calls[2]).to.equal(scratch.firstChild.firstChild);
 		render(<App count={2} />, scratch);
-		expect(calls[3]).to.equal(null);
-		expect(calls[4]).to.equal(scratch.firstChild.firstChild);
+		expect(calls.length).to.equal(5);
+		expect(calls).to.deep.equal([
+			scratch.firstChild.firstChild,
+			null,
+			scratch.firstChild.firstChild,
+			null,
+			scratch.firstChild.firstChild
+		]);
 	});
 
 	it('should properly call null for memoized components unkeyed', () => {
@@ -534,12 +537,9 @@ describe('refs', () => {
 		}
 
 		render(<App count={0} />, scratch);
-		expect(calls[0]).to.equal(scratch.firstChild.firstChild);
 		render(<App count={1} />, scratch);
-		expect(calls[1]).to.equal(null);
-		expect(calls[2]).to.equal(scratch.firstChild.firstChild);
 		render(<App count={2} />, scratch);
-		expect(calls[3]).to.equal(null);
-		expect(calls[4]).to.equal(scratch.firstChild.firstChild);
+		expect(calls.length).to.equal(1);
+		expect(calls[0]).to.equal(scratch.firstChild.firstChild);
 	});
 });