Upgrade testing library react to v14 #2182 (#2568)

cybersemics · Nov 10, 2024 · f8b53ef · f8b53ef
1 parent 4ac9b8e
commit f8b53ef
Show file tree

Hide file tree

Showing 6 changed files with 1,955 additions and 3,418 deletions.
diff --git a/package.json b/package.json
@@ -154,7 +154,7 @@
     "@sinonjs/fake-timers": "^13.0.4",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/jest-dom": "^6.6.2",
-    "@testing-library/react": "^12.1.5",
+    "@testing-library/react": "^14.0.0",
     "@testing-library/user-event": "^14.5.2",
     "@total-typescript/ts-reset": "^0.6.1",
     "@trivago/prettier-plugin-sort-imports": "^4.3.0",

diff --git a/src/components/__tests__/Bullet.ts b/src/components/__tests__/Bullet.ts
@@ -184,6 +184,8 @@ describe('expansion', () => {
     const user = userEvent.setup({ delay: null })
     await user.click(bulletOfThoughtA)
 
+    await vi.runOnlyPendingTimersAsync()
+
     const thoughtCursor = await findCursor()
     expect(thoughtCursor).toHaveTextContent('x')
   })

diff --git a/src/components/__tests__/ContextView.ts b/src/components/__tests__/ContextView.ts
@@ -475,11 +475,13 @@ describe.skip('editing', () => {
     const subthoughts = await findSubthoughts('m')
 
     const thoughtA = await findByLabelText(subthoughts[0], 'thought')
-    userEvent.click(thoughtA)
 
-    userEvent.type(thoughtA, 'z')
+    const user = userEvent.setup({ delay: null })
+    await user.click(thoughtA)
 
-    userEvent.type(thoughtA, '{esc}')
+    await user.type(thoughtA, 'z')
+
+    await user.type(thoughtA, '{esc}')
     store.dispatch(toggleContextView())
 
     const thoughtA2 = await findAllThoughtsByText('a')

diff --git a/src/shortcuts/__tests__/delete.ts b/src/shortcuts/__tests__/delete.ts
@@ -29,6 +29,8 @@ describe('delete', () => {
 
       executeShortcut(deleteShortcut, { store })
 
+      await vi.runOnlyPendingTimersAsync()
+
       const popupValue = document.querySelector('[data-testid="popup-value"]')!
       expect(popupValue.textContent).toBe('Permanently deleted test')
     })

diff --git a/src/shortcuts/__tests__/toggleSort.ts b/src/shortcuts/__tests__/toggleSort.ts
@@ -352,6 +352,8 @@ describe('DOM', () => {
 
       executeShortcut(toggleSortShortcut, { store })
 
+      await vi.runOnlyPendingTimersAsync()
+
       const thoughtC = getThoughtByContext(['c'])
       expect(thoughtC).toBeTruthy()
 
@@ -375,6 +377,8 @@ describe('DOM', () => {
 
       executeShortcut(toggleSortShortcut, { store })
 
+      await vi.runOnlyPendingTimersAsync()
+
       const thought = getThoughtByContext(['a'])
       expect(thought).toBeTruthy()
 
@@ -399,6 +403,8 @@ describe('DOM', () => {
 
       executeShortcut(toggleSortShortcut, { store })
 
+      await vi.runOnlyPendingTimersAsync()
+
       const thought = getThoughtByContext(['c'])
       expect(thought).toBeTruthy()
 
@@ -423,6 +429,8 @@ describe('DOM', () => {
       executeShortcut(toggleSortShortcut, { store })
       executeShortcut(toggleSortShortcut, { store })
 
+      await vi.runOnlyPendingTimersAsync()
+
       const thoughtA = getThoughtByContext(['a'])
       expect(thoughtA).toBeTruthy()
 
@@ -541,6 +549,8 @@ describe('DOM', () => {
         newThought({ value: '' }),
       ])
 
+      await vi.runOnlyPendingTimersAsync()
+
       const thoughts = screen.getAllByTestId(/thought/)
       const childrenString = thoughts
         .map((child: HTMLElement) => child.textContent)
@@ -567,6 +577,8 @@ describe('DOM', () => {
         newThought({ value: '' }),
       ])
 
+      await vi.runOnlyPendingTimersAsync()
+
       const thoughts = screen.getAllByTestId(/thought/)
 
       const childrenString = thoughts
@@ -594,6 +606,8 @@ describe('DOM', () => {
         newThought({ value: '' }),
       ])
 
+      await vi.runOnlyPendingTimersAsync()
+
       const thoughts = screen.getAllByTestId(/thought/)
 
       const childrenString = thoughts
@@ -621,6 +635,8 @@ describe('DOM', () => {
         newThought({ value: '', insertBefore: true }),
       ])
 
+      await vi.runOnlyPendingTimersAsync()
+
       const thoughts = screen.getAllByTestId(/thought/)
 
       const childrenString = thoughts
@@ -648,6 +664,8 @@ describe('DOM', () => {
         newThought({ value: '', insertBefore: true }),
       ])
 
+      await vi.runOnlyPendingTimersAsync()
+
       const thoughts = screen.getAllByTestId(/thought/)
 
       const childrenString = thoughts
@@ -675,6 +693,8 @@ describe('DOM', () => {
         newThought({ value: '', insertBefore: true }),
       ])
 
+      await vi.runOnlyPendingTimersAsync()
+
       const thoughts = screen.getAllByTestId(/thought/)
 
       const childrenString = thoughts
@@ -708,6 +728,8 @@ describe('DOM', () => {
         newThought({ value: '' }),
       ])
 
+      await vi.runOnlyPendingTimersAsync()
+
       const thoughts = screen.getAllByTestId(/thought/)
 
       const childrenString = thoughts
@@ -735,6 +757,8 @@ describe('DOM', () => {
         newThought({ value: '', insertNewSubthought: true }),
       ])
 
+      await vi.runOnlyPendingTimersAsync()
+
       const thoughts = screen.getAllByTestId(/thought/)
 
       const childrenString = thoughts
@@ -763,6 +787,8 @@ describe('DOM', () => {
         newThought({ value: '' }),
       ])
 
+      await vi.runOnlyPendingTimersAsync()
+
       const thoughts = screen.getAllByTestId(/thought/)
 
       const childrenString = thoughts
@@ -790,6 +816,8 @@ describe('DOM', () => {
         newThought({ value: '', insertNewSubthought: true }),
       ])
 
+      await vi.runOnlyPendingTimersAsync()
+
       const thoughts = screen.getAllByTestId(/thought/)
 
       const childrenString = thoughts
@@ -817,6 +845,8 @@ describe('DOM', () => {
         newThought({ value: '', insertNewSubthought: true, insertBefore: true }),
       ])
 
+      await vi.runOnlyPendingTimersAsync()
+
       const thoughts = screen.getAllByTestId(/thought/)
 
       const childrenString = thoughts
@@ -850,6 +880,8 @@ describe('DOM', () => {
           ),
       ])
 
+      await vi.runOnlyPendingTimersAsync()
+
       const thoughts = screen.getAllByTestId(/thought/)
 
       const childrenString = thoughts