Remove always-true hasHooks flag

wojtekmaj · Nov 4, 2022 · 9067f76 · 9067f76
1 parent 1e2f272
commit 9067f76
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 38 deletions.
diff --git a/test/test/_helpers/describeHooks.js b/test/test/_helpers/describeHooks.js
@@ -7,7 +7,6 @@ export default function describeHooks({ Wrap, Wrapper }, ...hooks) {
 
   hooks.forEach((hook) => {
     require(`../shared/hooks/${hook}`).default({
-      hasHooks: true,
       Wrap,
       WrapRendered: isShallow ? Wrap : (...args) => Wrap(...args).children(),
       Wrapper,

diff --git a/test/test/shared/hooks/_hook.template b/test/test/shared/hooks/_hook.template
@@ -28,7 +28,6 @@ import {
 } from '../../_helpers/react-compat';
 
 export default function describe$Hook({
-  hasHooks,
   Wrap,
   WrapRendered,
   Wrapper,
@@ -37,6 +36,6 @@ export default function describe$Hook({
   isMount,
   makeDOMElement,
 }) {
-  describeIf(hasHooks, 'hooks: $Hook', () => {
+  describe('hooks: $Hook', () => {
   });
 }
diff --git a/test/test/shared/hooks/custom.jsx b/test/test/shared/hooks/custom.jsx
@@ -6,8 +6,8 @@ import { describeIf } from '../../_helpers';
 
 import { useEffect, useState } from '../../_helpers/react-compat';
 
-export default function describeCustomHooks({ hasHooks, Wrap, isShallow }) {
-  describeIf(hasHooks, 'hooks: custom', () => {
+export default function describeCustomHooks({ Wrap, isShallow }) {
+  describe('hooks: custom', () => {
     describe('custom hook: useCounter', () => {
       function useCounter({ initialCount = 0, step = 1 } = {}) {
         const [count, setCount] = useState(initialCount);

diff --git a/test/test/shared/hooks/useCallback.jsx b/test/test/shared/hooks/useCallback.jsx
@@ -1,12 +1,12 @@
 import React from 'react';
 import { expect } from 'chai';
 
-import { describeIf, itIf } from '../../_helpers';
+import { itIf } from '../../_helpers';
 
 import { useCallback } from '../../_helpers/react-compat';
 
-export default function describeUseCallback({ hasHooks, Wrap, isShallow }) {
-  describeIf(hasHooks, 'hooks: useCallback', () => {
+export default function describeUseCallback({ Wrap, isShallow }) {
+  describe('hooks: useCallback', () => {
     function RendersNull() {
       return null;
     }

diff --git a/test/test/shared/hooks/useContext.jsx b/test/test/shared/hooks/useContext.jsx
@@ -5,8 +5,8 @@ import { describeIf, itIf } from '../../_helpers';
 
 import { useContext, useState, createContext } from '../../_helpers/react-compat';
 
-export default function describeUseContext({ hasHooks, Wrap, isShallow }) {
-  describeIf(hasHooks, 'hooks: useContext', () => {
+export default function describeUseContext({ Wrap, isShallow }) {
+  describe('hooks: useContext', () => {
     describe('simple example', () => {
       const initialTitle = 'initialTitle';
       const TitleContext = createContext && createContext(initialTitle);

diff --git a/test/test/shared/hooks/useDebugValue.jsx b/test/test/shared/hooks/useDebugValue.jsx
@@ -2,13 +2,11 @@ import React from 'react';
 import { expect } from 'chai';
 import sinon from 'sinon';
 
-import { describeIf } from '../../_helpers';
-
 import { useDebugValue } from '../../_helpers/react-compat';
 
-export default function describeUseDebugValue({ hasHooks, Wrap }) {
+export default function describeUseDebugValue({ Wrap }) {
   // TODO: `useDebugValue`: test using react debug tools, verify it actually works, and try to add it to `.debug`
-  describeIf(hasHooks, 'hooks: useDebugValue', () => {
+  describe('hooks: useDebugValue', () => {
     function ComponentUsingDebugValue({ value }) {
       useDebugValue(`debug value: ${value}`);
 

diff --git a/test/test/shared/hooks/useEffect.jsx b/test/test/shared/hooks/useEffect.jsx
@@ -5,9 +5,9 @@ import sinon from 'sinon-sandbox';
 import { describeIf, itIf } from '../../_helpers';
 import { useEffect, useState, Fragment } from '../../_helpers/react-compat';
 
-export default function describeUseEffect({ hasHooks, Wrap, isShallow }) {
+export default function describeUseEffect({ Wrap, isShallow }) {
   // TODO: enable when the shallow renderer fixes its bug, see https://github.com/facebook/react/issues/15275.
-  describeIf(hasHooks && !isShallow, 'hooks: useEffect', () => {
+  describeIf(!isShallow, 'hooks: useEffect', () => {
     const timeout = 100;
     function ComponentUsingEffectHook() {
       const [ctr, setCtr] = useState(0);

diff --git a/test/test/shared/hooks/useImperativeHandle.jsx b/test/test/shared/hooks/useImperativeHandle.jsx
@@ -2,12 +2,10 @@ import React from 'react';
 import { expect } from 'chai';
 import sinon from 'sinon-sandbox';
 
-import { describeIf } from '../../_helpers';
-
 import { useImperativeHandle, useRef, forwardRef } from '../../_helpers/react-compat';
 
-export default function describeUseImperativeHandle({ hasHooks, Wrap, isShallow }) {
-  describeIf(hasHooks, 'hooks: useImperativeHandle', () => {
+export default function describeUseImperativeHandle({ Wrap, isShallow }) {
+  describe('hooks: useImperativeHandle', () => {
     function Computer({ compute }, ref) {
       const computerRef = useRef({ compute });
       useImperativeHandle(ref, () => ({

diff --git a/test/test/shared/hooks/useLayoutEffect.jsx b/test/test/shared/hooks/useLayoutEffect.jsx
@@ -1,12 +1,12 @@
 import React from 'react';
 import { expect } from 'chai';
 
-import { describeIf, itIf } from '../../_helpers';
+import { itIf } from '../../_helpers';
 
 import { useLayoutEffect, useState } from '../../_helpers/react-compat';
 
-export default function describeUseLayoutEffect({ hasHooks, Wrap, isShallow }) {
-  describeIf(hasHooks, 'hooks: useLayoutEffect', () => {
+export default function describeUseLayoutEffect({ Wrap, isShallow }) {
+  describe('hooks: useLayoutEffect', () => {
     function ComponentUsingLayoutEffectHook() {
       const [ctr, setCtr] = useState(0);
       useLayoutEffect(() => {

diff --git a/test/test/shared/hooks/useMemo.jsx b/test/test/shared/hooks/useMemo.jsx
@@ -1,12 +1,10 @@
 import React from 'react';
 import { expect } from 'chai';
 
-import { describeIf } from '../../_helpers';
-
 import { useMemo } from '../../_helpers/react-compat';
 
-export default function describeUseMemo({ hasHooks, Wrap }) {
-  describeIf(hasHooks, 'hooks: useMemo', () => {
+export default function describeUseMemo({ Wrap }) {
+  describe('hooks: useMemo', () => {
     function RendersNull() {
       return null;
     }

diff --git a/test/test/shared/hooks/useReducer.jsx b/test/test/shared/hooks/useReducer.jsx
@@ -1,12 +1,10 @@
 import React from 'react';
 import { expect } from 'chai';
 
-import { describeIf } from '../../_helpers';
-
 import { useReducer } from '../../_helpers/react-compat';
 
-export default function describeUseReducer({ hasHooks, Wrap }) {
-  describeIf(hasHooks, 'hooks: useReducer', () => {
+export default function describeUseReducer({ Wrap }) {
+  describe('hooks: useReducer', () => {
     describe('with custom dispatch', () => {
       const initialState = [];
 

diff --git a/test/test/shared/hooks/useRef.jsx b/test/test/shared/hooks/useRef.jsx
@@ -1,12 +1,10 @@
 import React from 'react';
 import { expect } from 'chai';
 
-import { describeIf } from '../../_helpers';
-
 import { useRef } from '../../_helpers/react-compat';
 
-export default function describeUseRef({ hasHooks, Wrap }) {
-  describeIf(hasHooks, 'hooks: useRef', () => {
+export default function describeUseRef({ Wrap }) {
+  describe('hooks: useRef', () => {
     function ComponentUsingRef() {
       const id = useRef(Math.floor(100 * Math.random()));
       return <div>{id.current}</div>;

diff --git a/test/test/shared/hooks/useState.jsx b/test/test/shared/hooks/useState.jsx
@@ -1,12 +1,12 @@
 import React from 'react';
 import { expect } from 'chai';
 
-import { describeIf, itIf } from '../../_helpers';
+import { itIf } from '../../_helpers';
 
 import { useState, useEffect, Fragment } from '../../_helpers/react-compat';
 
-export default function describeUseState({ hasHooks, Wrap, isShallow }) {
-  describeIf(hasHooks, 'hooks: useState', () => {
+export default function describeUseState({ Wrap, isShallow }) {
+  describe('hooks: useState', () => {
     function FooCounter({ initialCount: initial = 0 }) {
       const [count, setCount] = useState(+initial);