Skip to content

Commit 22dafeb

Browse files
committed
update test merge conflict
1 parent 61e4ab9 commit 22dafeb

1 file changed

Lines changed: 2 additions & 7 deletions

File tree

src/__tests__/CompareResults/ResultsView.test.tsx

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,8 @@ import type { ReactElement } from 'react';
33
import fetchMock from '@fetch-mock/jest';
44
import userEvent from '@testing-library/user-event';
55
import { init as echartsInit } from 'echarts';
6-
import type {
7-
EChartsOption,
8-
LineSeriesOption,
9-
ScatterSeriesOption,
10-
} from 'echarts';
6+
import type { EChartsOption, LineSeriesOption } from 'echarts';
117

12-
import CommonGraph from '../../components/CompareResults/CommonGraph';
138
import { loader } from '../../components/CompareResults/loader';
149
import ResultsView from '../../components/CompareResults/ResultsView';
1510
import TestHeader from '../../components/CompareResults/TestHeader';
@@ -20,7 +15,7 @@ import type { Framework } from '../../types/types';
2015
import { fftkde } from '../../utils/kde.js';
2116
import { getLocationOrigin } from '../../utils/location';
2217
import getTestData from '../utils/fixtures';
23-
import { render, renderWithRouter, screen, waitFor } from '../utils/test-utils';
18+
import { renderWithRouter, screen, waitFor } from '../utils/test-utils';
2419

2520
function renderWithRoute(component: ReactElement) {
2621
const { testCompareData, testData } = getTestData();

0 commit comments

Comments
 (0)