More typescripting

GMOD · Sep 7, 2022 · b98f59a · b98f59a
1 parent b031e6e
commit b98f59a
Show file tree

Hide file tree

Showing 22 changed files with 39 additions and 99 deletions.
diff --git a/...rowse-web/src/tests/1.Spreadsheet.test.js → ...owse-web/src/tests/1.Spreadsheet.test.tsx b/...rowse-web/src/tests/1.Spreadsheet.test.js → ...owse-web/src/tests/1.Spreadsheet.test.tsx
@@ -1,25 +1,23 @@
-import React from 'react'
 import '@testing-library/jest-dom/extend-expect'
-import { fireEvent, render, waitFor } from '@testing-library/react'
-import { toMatchImageSnapshot } from 'jest-image-snapshot'
+import { fireEvent, waitFor } from '@testing-library/react'
 import { LocalFile } from 'generic-filehandle'
 import { clearCache } from '@jbrowse/core/util/io/RemoteFileWithRangeCache'
 import { clearAdapterCache } from '@jbrowse/core/data_adapters/dataAdapterCache'
 import { TextEncoder, TextDecoder } from 'web-encoding'
 
-import { JBrowse, setup, getPluginManager, generateReadBuffer } from './util'
+import { createView, setup, generateReadBuffer } from './util'
 
 window.TextEncoder = TextEncoder
 window.TextDecoder = TextDecoder
 
-expect.extend({ toMatchImageSnapshot })
-
 setup()
 
 beforeEach(() => {
   clearCache()
   clearAdapterCache()
+  // @ts-ignore
   fetch.resetMocks()
+  // @ts-ignore
   fetch.mockResponse(
     generateReadBuffer(
       url => new LocalFile(require.resolve(`../../test_data/volvox/${url}`)),
@@ -30,10 +28,7 @@ beforeEach(() => {
 const delay = { timeout: 10000 }
 
 test('opens a vcf.gz file in the spreadsheet view', async () => {
-  const pluginManager = getPluginManager()
-  const { findByTestId, getByTestId, findByText } = render(
-    <JBrowse pluginManager={pluginManager} />,
-  )
+  const { session, findByTestId, getByTestId, findByText } = createView()
   fireEvent.click(await findByText('File'))
   fireEvent.click(await findByText('Add'))
   fireEvent.click(await findByText('Spreadsheet view'))
@@ -48,14 +43,11 @@ test('opens a vcf.gz file in the spreadsheet view', async () => {
     ).not.toBeDisabled(),
   )
   fireEvent.click(await findByTestId('open_spreadsheet'))
-  expect(pluginManager.rootModel.session.views.length).toBe(2)
+  expect(session.views.length).toBe(2)
 }, 15000)
 
 test('opens a bed.gz file in the spreadsheet view', async () => {
-  const pluginManager = getPluginManager()
-  const { findByTestId, getByTestId, findByText } = render(
-    <JBrowse pluginManager={pluginManager} />,
-  )
+  const { findByTestId, session, getByTestId, findByText } = createView()
   fireEvent.click(await findByText('File'))
   fireEvent.click(await findByText('Add'))
   fireEvent.click(await findByText('Spreadsheet view'))
@@ -70,5 +62,5 @@ test('opens a bed.gz file in the spreadsheet view', async () => {
     ).not.toBeDisabled(),
   )
   fireEvent.click(await findByTestId('open_spreadsheet'))
-  expect(pluginManager.rootModel.session.views.length).toBe(2)
+  expect(session.views.length).toBe(2)
 }, 15000)
diff --git a/...rowse-web/src/tests/2.SVInspector.test.js → ...owse-web/src/tests/2.SVInspector.test.tsx b/...rowse-web/src/tests/2.SVInspector.test.js → ...owse-web/src/tests/2.SVInspector.test.tsx
@@ -1,25 +1,23 @@
-import React from 'react'
 import '@testing-library/jest-dom/extend-expect'
-import { fireEvent, render, waitFor } from '@testing-library/react'
-import { toMatchImageSnapshot } from 'jest-image-snapshot'
+import { fireEvent, waitFor } from '@testing-library/react'
 import { LocalFile } from 'generic-filehandle'
 import { clearCache } from '@jbrowse/core/util/io/RemoteFileWithRangeCache'
 import { clearAdapterCache } from '@jbrowse/core/data_adapters/dataAdapterCache'
 import { TextEncoder, TextDecoder } from 'web-encoding'
 
-import { JBrowse, setup, getPluginManager, generateReadBuffer } from './util'
+import { setup, createView, generateReadBuffer } from './util'
 
 window.TextEncoder = TextEncoder
 window.TextDecoder = TextDecoder
 
-expect.extend({ toMatchImageSnapshot })
-
 setup()
 
 beforeEach(() => {
   clearCache()
   clearAdapterCache()
+  // @ts-ignore
   fetch.resetMocks()
+  // @ts-ignore
   fetch.mockResponse(
     generateReadBuffer(url => {
       return new LocalFile(require.resolve(`../../test_data/volvox/${url}`))
@@ -31,13 +29,8 @@ const delay = { timeout: 20000 }
 
 test('opens a vcf.gz file in the sv inspector view', async () => {
   console.warn = jest.fn()
-  const pluginManager = getPluginManager()
-  const { findByTestId, getByTestId, findByText } = render(
-    <JBrowse pluginManager={pluginManager} />,
-  )
-  const {
-    rootModel: { session },
-  } = pluginManager
+  const { session, findByTestId, getByTestId, findByText } = createView()
+
   fireEvent.click(await findByText('File'))
   fireEvent.click(await findByText('Add'))
   fireEvent.click(await findByText('SV inspector'))

diff --git a/products/jbrowse-web/src/tests/Alignments.test.tsx b/products/jbrowse-web/src/tests/Alignments.test.tsx
@@ -4,7 +4,6 @@ import { LocalFile } from 'generic-filehandle'
 // locals
 import { clearCache } from '@jbrowse/core/util/io/RemoteFileWithRangeCache'
 import { clearAdapterCache } from '@jbrowse/core/data_adapters/dataAdapterCache'
-import { toMatchImageSnapshot } from 'jest-image-snapshot'
 import {
   setup,
   expectCanvasMatch,
@@ -14,7 +13,6 @@ import {
   pc,
 } from './util'
 
-expect.extend({ toMatchImageSnapshot })
 setup()
 
 beforeEach(() => {

diff --git a/products/jbrowse-web/src/tests/AlignmentsFeatures.test.tsx b/products/jbrowse-web/src/tests/AlignmentsFeatures.test.tsx
@@ -4,7 +4,6 @@ import { LocalFile } from 'generic-filehandle'
 // locals
 import { clearCache } from '@jbrowse/core/util/io/RemoteFileWithRangeCache'
 import { clearAdapterCache } from '@jbrowse/core/data_adapters/dataAdapterCache'
-import { toMatchImageSnapshot } from 'jest-image-snapshot'
 import {
   setup,
   expectCanvasMatch,
@@ -14,7 +13,6 @@ import {
   hts,
 } from './util'
 
-expect.extend({ toMatchImageSnapshot })
 setup()
 
 beforeEach(() => {

diff --git a/...owse-web/src/tests/Authentication.test.js → ...wse-web/src/tests/Authentication.test.tsx b/...owse-web/src/tests/Authentication.test.js → ...wse-web/src/tests/Authentication.test.tsx
@@ -1,29 +1,27 @@
-import React from 'react'
-import { fireEvent, render, waitFor, within } from '@testing-library/react'
+import { fireEvent, waitFor, within } from '@testing-library/react'
 import { LocalFile, RemoteFile } from 'generic-filehandle'
 import { clearCache } from '@jbrowse/core/util/io/RemoteFileWithRangeCache'
 import { clearAdapterCache } from '@jbrowse/core/data_adapters/dataAdapterCache'
 import crypto from 'crypto'
-import { toMatchImageSnapshot } from 'jest-image-snapshot'
 import config from '../../test_data/volvox/config.json'
 import {
-  JBrowse,
   setup,
+  createView,
   expectCanvasMatch,
   generateReadBuffer,
-  getPluginManager,
 } from './util'
 
-expect.extend({ toMatchImageSnapshot })
 setup()
-
+// @ts-ignore
 global.crypto = { getRandomValues: crypto.randomFillSync }
 
 beforeEach(() => {
   clearCache()
   clearAdapterCache()
   sessionStorage.clear()
+  // @ts-ignore
   fetch.resetMocks()
+  // @ts-ignore
   fetch.mockResponse(
     generateReadBuffer(
       url => new LocalFile(require.resolve(`../../test_data/volvox/${url}`)),
@@ -34,7 +32,7 @@ beforeEach(() => {
 const delay = { timeout: 20000 }
 
 test('open a bigwig track that needs oauth authentication and has existing token', async () => {
-  const pm = getPluginManager({
+  const { state, view, findByTestId, findByText } = createView({
     ...config,
     tracks: [
       {
@@ -54,17 +52,18 @@ test('open a bigwig track that needs oauth authentication and has existing token
       },
     ],
   })
-  const state = pm.rootModel
-  const { findByTestId, findByText } = render(<JBrowse pluginManager={pm} />)
   const token = '1234'
   sessionStorage.setItem('dropboxOAuth-token', token)
+  // @ts-ignore
   await waitFor(() => expect(state.internetAccounts.length).toBe(2))
+  // @ts-ignore
   state.internetAccounts[0].validateToken = jest.fn().mockReturnValue(token)
+  // @ts-ignore
   state.internetAccounts[0].openLocation = jest
     .fn()
     .mockReturnValue(new RemoteFile('volvox_microarray_dropbox.bw'))
   await findByText('Help')
-  state.session.views[0].setNewView(5, 0)
+  view.setNewView(5, 0)
   fireEvent.click(
     await findByTestId('htsTrackEntry-volvox_microarray_dropbox', {}, delay),
   )
@@ -78,7 +77,7 @@ test('open a bigwig track that needs oauth authentication and has existing token
 }, 25000)
 
 test('opens a bigwig track that needs external token authentication', async () => {
-  const pm = getPluginManager({
+  const { view, findByTestId } = createView({
     ...config,
     internetAccounts: [
       {
@@ -107,9 +106,7 @@ test('opens a bigwig track that needs external token authentication', async () =
       },
     ],
   })
-  const state = pm.rootModel
-  const { findByTestId } = render(<JBrowse pluginManager={pm} />)
-  state.session.views[0].setNewView(5, 0)
+  view.setNewView(5, 0)
   fireEvent.click(
     await findByTestId(
       'htsTrackEntry-volvox_microarray_externaltoken',
@@ -138,7 +135,7 @@ test('opens a bigwig track that needs external token authentication', async () =
 }, 25000)
 
 test('opens a bigwig track that needs httpbasic authentication', async () => {
-  const pm = getPluginManager({
+  const { view, findByTestId, findByText } = createView({
     ...config,
     tracks: [
       {
@@ -158,9 +155,7 @@ test('opens a bigwig track that needs httpbasic authentication', async () => {
       },
     ],
   })
-  const state = pm.rootModel
-  const { findByTestId, findByText } = render(<JBrowse pluginManager={pm} />)
-  state.session.views[0].setNewView(5, 0)
+  view.setNewView(5, 0)
   fireEvent.click(
     await findByTestId('htsTrackEntry-volvox_microarray_httpbasic', {}, delay),
   )

diff --git a/products/jbrowse-web/src/tests/BigWig.test.tsx b/products/jbrowse-web/src/tests/BigWig.test.tsx
@@ -2,7 +2,6 @@ import { fireEvent } from '@testing-library/react'
 import { LocalFile } from 'generic-filehandle'
 import { clearCache } from '@jbrowse/core/util/io/RemoteFileWithRangeCache'
 import { clearAdapterCache } from '@jbrowse/core/data_adapters/dataAdapterCache'
-import { toMatchImageSnapshot } from 'jest-image-snapshot'
 
 import {
   setup,
@@ -13,7 +12,6 @@ import {
   hts,
 } from './util'
 
-expect.extend({ toMatchImageSnapshot })
 setup()
 
 beforeEach(() => {

diff --git a/products/jbrowse-web/src/tests/BookmarkWidget.test.tsx b/products/jbrowse-web/src/tests/BookmarkWidget.test.tsx
@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-import React from 'react'
 import { fireEvent } from '@testing-library/react'
 import { LocalFile } from 'generic-filehandle'
 import { clearCache } from '@jbrowse/core/util/io/RemoteFileWithRangeCache'

diff --git a/products/jbrowse-web/src/tests/BreakpointSplitView.test.tsx b/products/jbrowse-web/src/tests/BreakpointSplitView.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { waitFor } from '@testing-library/react'
 import { LocalFile } from 'generic-filehandle'
 import { clearCache } from '@jbrowse/core/util/io/RemoteFileWithRangeCache'

diff --git a/products/jbrowse-web/src/tests/ConfigurationEditor.test.tsx b/products/jbrowse-web/src/tests/ConfigurationEditor.test.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
 import React from 'react'
 import '@testing-library/jest-dom/extend-expect'
 import { fireEvent, waitFor } from '@testing-library/react'

diff --git a/products/jbrowse-web/src/tests/Dotplot.test.tsx b/products/jbrowse-web/src/tests/Dotplot.test.tsx
@@ -2,7 +2,6 @@ import { fireEvent } from '@testing-library/react'
 import { LocalFile } from 'generic-filehandle'
 import { clearCache } from '@jbrowse/core/util/io/RemoteFileWithRangeCache'
 import { clearAdapterCache } from '@jbrowse/core/data_adapters/dataAdapterCache'
-import { toMatchImageSnapshot } from 'jest-image-snapshot'
 import { TextEncoder, TextDecoder } from 'web-encoding'
 import path from 'path'
 import dotplotConfig from '../../test_data/config_dotplot.json'
@@ -19,18 +18,9 @@ if (!window.TextEncoder) {
 if (!window.TextDecoder) {
   window.TextDecoder = TextDecoder
 }
-const config = {
-  ...dotplotConfig,
-  configuration: {
-    rpc: {
-      defaultDriver: 'MainThreadRpcDriver',
-    },
-  },
-}
 
 const delay = { timeout: 25000 }
 
-expect.extend({ toMatchImageSnapshot })
 setup()
 
 beforeEach(() => {
@@ -48,12 +38,13 @@ beforeEach(() => {
 })
 
 test('open a dotplot view', async () => {
-  const { findByTestId } = createView(config)
+  const { findByTestId } = createView(dotplotConfig)
   expectCanvasMatch(await findByTestId('prerendered_canvas_done', {}, delay))
 }, 20000)
 
 test('open a dotplot view with import form', async () => {
-  const { findByTestId, findAllByTestId, findByText } = createView(config)
+  const { findByTestId, findAllByTestId, findByText } =
+    createView(dotplotConfig)
 
   fireEvent.click(await findByTestId('close_view'))
   fireEvent.click(await findByText('File'))
@@ -67,7 +58,7 @@ test('open a dotplot view with import form', async () => {
   })
   fireEvent.change(await findByTestId('urlInput', {}, delay), {
     target: {
-      value: 'peach_grape_small.paf',
+      value: 'peach_grape_small.paf.gz',
     },
   })
   fireEvent.click(await findByTestId('submitDotplot'))

diff --git a/products/jbrowse-web/src/tests/ErrorConditions.test.tsx b/products/jbrowse-web/src/tests/ErrorConditions.test.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
 import React from 'react'
 import { render } from '@testing-library/react'
 import { ErrorBoundary } from 'react-error-boundary'

diff --git a/products/jbrowse-web/src/tests/ExportSvg.test.tsx b/products/jbrowse-web/src/tests/ExportSvg.test.tsx
@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-import React from 'react'
 import { fireEvent, waitFor } from '@testing-library/react'
 import { TextEncoder } from 'web-encoding'
 import { LocalFile } from 'generic-filehandle'

diff --git a/products/jbrowse-web/src/tests/Hic.test.tsx b/products/jbrowse-web/src/tests/Hic.test.tsx
@@ -1,6 +1,5 @@
 import { fireEvent } from '@testing-library/react'
 import { LocalFile } from 'generic-filehandle'
-import { toMatchImageSnapshot } from 'jest-image-snapshot'
 
 import {
   setup,
@@ -12,7 +11,6 @@ import {
 } from './util'
 import hicConfig from '../../../../extra_test_data/hic_integration_test.json'
 
-expect.extend({ toMatchImageSnapshot })
 setup()
 
 const delay = { timeout: 20000 }
@@ -28,14 +26,8 @@ test('hic', async () => {
     ),
   )
 
-  const { view, findByTestId } = createView({
-    ...hicConfig,
-    configuration: {
-      rpc: {
-        defaultDriver: 'MainThreadRpcDriver',
-      },
-    },
-  })
+  const { view, findByTestId } = createView(hicConfig)
+
   view.setNewView(5000, 0)
   fireEvent.click(await findByTestId(hts('hic_test'), {}, delay))
   expectCanvasMatch(await findByTestId(pc('{hg19}1:1..4,000,000-0'), {}, delay))

diff --git a/products/jbrowse-web/src/tests/ReadVsRef.test.tsx b/products/jbrowse-web/src/tests/ReadVsRef.test.tsx
@@ -1,20 +1,16 @@
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-import React from 'react'
 import { fireEvent, waitFor } from '@testing-library/react'
 import { LocalFile } from 'generic-filehandle'
 
 // locals
 import { clearCache } from '@jbrowse/core/util/io/RemoteFileWithRangeCache'
 import { clearAdapterCache } from '@jbrowse/core/data_adapters/dataAdapterCache'
-import { toMatchImageSnapshot } from 'jest-image-snapshot'
 import {
   setup,
   createView,
   expectCanvasMatch,
   generateReadBuffer,
 } from './util'
 
-expect.extend({ toMatchImageSnapshot })
 setup()
 
 beforeEach(() => {