chore: update timeouts

JB1905 · Apr 4, 2021 · cf5db7e · cf5db7e
1 parent cebf4ab
commit cf5db7e
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 6 deletions.
diff --git a/packages/timeouts/__tests__/Timeouts.test.tsx b/packages/timeouts/__tests__/Timeouts.test.tsx
@@ -7,10 +7,17 @@ describe('SetTimeout', () => {
   const TIMEOUT = 4000;
 
   it('should render content after timeout', async () => {
+    const onEnabled = jest.fn();
+    const onDisabled = jest.fn();
     const onTimeout = jest.fn();
 
     const { container, getByText } = render(
-      <SetTimeout enabled timeout={TIMEOUT} onTimeout={onTimeout}>
+      <SetTimeout
+        enabled
+        timeout={TIMEOUT}
+        onEnabled={onEnabled}
+        onTimeout={onTimeout}
+      >
         <p>Hello World!</p>
       </SetTimeout>
     );
@@ -19,6 +26,8 @@ describe('SetTimeout', () => {
       () => {
         expect(getByText('Hello World!')).toBeDefined();
 
+        expect(onEnabled).toHaveBeenCalled();
+        expect(onDisabled).not.toHaveBeenCalled();
         expect(onTimeout).toHaveBeenCalledTimes(1);
       },
       {
@@ -30,6 +39,8 @@ describe('SetTimeout', () => {
   });
 
   it('should not render content after timeout when timer is not enabled', async () => {
+    const onEnabled = jest.fn();
+    const onDisabled = jest.fn();
     const onTimeout = jest.fn();
 
     const { container } = render(
@@ -38,10 +49,27 @@ describe('SetTimeout', () => {
       </SetTimeout>
     );
 
-    await waitFor(() => expect(onTimeout).toHaveBeenCalledTimes(0), {
-      timeout: TIMEOUT,
-    });
+    await waitFor(
+      () => {
+        expect(onEnabled).not.toHaveBeenCalled();
+        expect(onDisabled).toHaveBeenCalled();
+        expect(onTimeout).toHaveBeenCalledTimes(0);
+      },
+      {
+        timeout: TIMEOUT,
+      }
+    );
 
     expect(container).toMatchSnapshot();
   });
 });
+
+describe('SetInterval', () => {
+  it.skip('should', () => {
+    // const { container } = render(
+    //   <SetInterval>
+    //     <p>Hello World!</p>
+    //   </SetInterval>
+    // );
+  });
+});
diff --git a/packages/timeouts/src/SetTimeout.ts b/packages/timeouts/src/SetTimeout.ts
@@ -22,9 +22,9 @@ export const SetTimeout = ({
   const [done, setDone] = useState(false);
 
   useEffect(() => {
-    onEnabled?.();
-
     if (enabled) {
+      onEnabled?.();
+
       const timer = setTimeout(() => {
         setDone(true);