Modularize tests

plugins/alignments/src/LinearSNPCoverageDisplay/model.ts

@@ -1,10 +1,10 @@
 import { lazy } from 'react'
 
-import VisibilityIcon from '@mui/icons-material/Visibility'
 import { getConf, readConfObject } from '@jbrowse/core/configuration'
 import SerializableFilterChain from '@jbrowse/core/pluggableElementTypes/renderers/util/serializableFilterChain'
 import { getContainingView } from '@jbrowse/core/util'
 import { linearWiggleDisplayModelFactory } from '@jbrowse/plugin-wiggle'
+import VisibilityIcon from '@mui/icons-material/Visibility'
 import { observable } from 'mobx'
 import { cast, getEnv, isAlive, types } from 'mobx-state-tree'
 

plugins/variants/src/shared/MultiVariantBaseModel.tsx

@@ -1,12 +1,12 @@
 import { lazy } from 'react'
 
-import PaletteIcon from '@mui/icons-material/Palette'
-import FilterListIcon from '@mui/icons-material/FilterList'
-import VisibilityIcon from '@mui/icons-material/Visibility'
 import { ConfigurationReference } from '@jbrowse/core/configuration'
 import { getSession } from '@jbrowse/core/util'
 import { stopStopToken } from '@jbrowse/core/util/stopToken'
 import { linearBareDisplayStateModelFactory } from '@jbrowse/plugin-linear-genome-view'
+import FilterListIcon from '@mui/icons-material/FilterList'
+import PaletteIcon from '@mui/icons-material/Palette'
+import VisibilityIcon from '@mui/icons-material/Visibility'
 import deepEqual from 'fast-deep-equal'
 import { types } from 'mobx-state-tree'
 

plugins/wiggle/src/LinearWiggleDisplay/model.ts

@@ -1,10 +1,10 @@
 import { lazy } from 'react'
 
-import PaletteIcon from '@mui/icons-material/Palette'
-import VisibilityIcon from '@mui/icons-material/Visibility'
-import EqualizerIcon from '@mui/icons-material/Equalizer'
 import { getConf } from '@jbrowse/core/configuration'
 import { getContainingView, getSession } from '@jbrowse/core/util'
+import EqualizerIcon from '@mui/icons-material/Equalizer'
+import PaletteIcon from '@mui/icons-material/Palette'
+import VisibilityIcon from '@mui/icons-material/Visibility'
 import { types } from 'mobx-state-tree'
 import { axisPropsFromTickScale } from 'react-d3-axis-mod'
 

products/jbrowse-web/src/tests/VcfMatrix.test.tsx

@@ -23,7 +23,7 @@ test('matrix', async () => {
   expectCanvasMatch(await findByTestId(/prerendered_canvas/, ...opts))
 }, 40000)
 
-test('matrix phased', async () => {
+test('mphased', async () => {
   const { view, findByTestId, findByText } = await createView()
   await view.navToLocString('ctgA')
   fireEvent.click(await findByTestId(hts('volvox_test_vcf'), ...opts))
@@ -38,33 +38,3 @@ test('matrix phased', async () => {
   fireEvent.click(await findByText('Force load', ...opts))
   expectCanvasMatch(await findByTestId(/prerendered_canvas/, ...opts))
 }, 40000)
-
-test('regular', async () => {
-  const { view, findByTestId, findByText, findAllByTestId } = await createView()
-
-  await view.navToLocString('ctgA')
-  fireEvent.click(await findByTestId(hts('volvox_test_vcf'), ...opts))
-
-  fireEvent.click(await findByTestId('track_menu_icon', ...opts))
-  fireEvent.click(await findByText('Display types', ...opts))
-  fireEvent.click(await findByText('Multi-variant display (regular)', ...opts))
-  fireEvent.click(await findByText('Force load', ...opts))
-  expectCanvasMatch((await findAllByTestId(/prerendered_canvas/, ...opts))[0]!)
-}, 40000)
-
-test('regular phased', async () => {
-  const { view, findByTestId, findByText, findAllByTestId } = await createView()
-
-  await view.navToLocString('ctgA')
-  fireEvent.click(await findByTestId(hts('volvox_test_vcf'), ...opts))
-
-  fireEvent.click(await findByTestId('track_menu_icon', ...opts))
-  fireEvent.click(await findByText('Display types', ...opts))
-  fireEvent.click(await findByText('Multi-variant display (regular)', ...opts))
-
-  // Using the track menu twice not working currently, manually poke this setting
-  view.tracks[0].displays[0].setPhasedMode('phased')
-
-  fireEvent.click(await findByText('Force load', ...opts))
-  expectCanvasMatch((await findAllByTestId(/prerendered_canvas/, ...opts))[0]!)
-}, 40000)

products/jbrowse-web/src/tests/VcfMatrixRegular.test.tsx

@@ -0,0 +1,44 @@
+import { fireEvent } from '@testing-library/react'
+
+import { createView, doBeforeEach, expectCanvasMatch, hts, setup } from './util'
+
+setup()
+
+beforeEach(() => {
+  doBeforeEach()
+})
+
+const delay = { timeout: 30000 }
+const opts = [{}, delay]
+
+test('regular', async () => {
+  const { view, findByTestId, findByText, findAllByTestId } = await createView()
+
+  await view.navToLocString('ctgA')
+  fireEvent.click(await findByTestId(hts('volvox_test_vcf'), ...opts))
+
+  fireEvent.click(await findByTestId('track_menu_icon', ...opts))
+  fireEvent.click(await findByText('Display types', ...opts))
+  fireEvent.click(await findByText('Multi-variant display (regular)', ...opts))
+  await new Promise(res => setTimeout(res, 1000))
+  fireEvent.click(await findByText('Force load', ...opts))
+
+  expectCanvasMatch((await findAllByTestId(/prerendered_canvas/, ...opts))[0]!)
+}, 40000)
+
+test('rphased', async () => {
+  const { view, findByTestId, findByText, findAllByTestId } = await createView()
+
+  await view.navToLocString('ctgA')
+  fireEvent.click(await findByTestId(hts('volvox_test_vcf'), ...opts))
+
+  fireEvent.click(await findByTestId('track_menu_icon', ...opts))
+  fireEvent.click(await findByText('Display types', ...opts))
+  fireEvent.click(await findByText('Multi-variant display (regular)', ...opts))
+
+  // Using the track menu twice not working currently, manually poke this setting
+  view.tracks[0].displays[0].setPhasedMode('phased')
+
+  fireEvent.click(await findByText('Force load', ...opts))
+  expectCanvasMatch((await findAllByTestId(/prerendered_canvas/, ...opts))[0]!)
+}, 40000)