Skip to content

Commit ec341f0

Browse files
mathuomathuo
committed
test: adjust tsconfig for tests
1 parent 575a1d7 commit ec341f0

File tree

17 files changed

+47
-57
lines changed

17 files changed

+47
-57
lines changed

‎packages/dockview-core/jest.config.ts

+8
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,14 @@ const config: JestConfigWithTsJest = {
2020
coverageDirectory: '<rootDir>/packages/dockview-core/coverage/',
2121
testResultsProcessor: 'jest-sonar-reporter',
2222
testEnvironment: 'jsdom',
23+
transform: {
24+
'^.+\\.tsx?$': [
25+
'ts-jest',
26+
{
27+
tsconfig: '<rootDir>/tsconfig.test.json',
28+
},
29+
],
30+
},
2331
};
2432

2533
export default config;

‎packages/dockview-core/src/__tests__/gridview/baseComponentGridview.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ describe('baseComponentGridview', () => {
114114
proportionalLayout: true,
115115
});
116116

117-
const events: TestPanel[] = [];
117+
const events: (TestPanel | undefined)[] = [];
118118

119119
const disposable = new CompositeDisposable(
120120
cut.onDidAddGroup((event) => {

‎packages/dockview-core/src/__tests__/groupview/dockviewGroupPanelModel.spec.ts

+10-12
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@ import { LocalSelectionTransfer, PanelTransfer } from '../../dnd/dataTransfer';
1818
import { CompositeDisposable } from '../../lifecycle';
1919
import { DockviewPanelApi } from '../../api/dockviewPanelApi';
2020
import { IDockviewPanel } from '../../dockview/dockviewPanel';
21-
import {
22-
IDockviewPanelModel,
23-
DockviewPanelModel,
24-
} from '../../dockview/dockviewPanelModel';
21+
import { IDockviewPanelModel } from '../../dockview/dockviewPanelModel';
2522
import { DockviewGroupPanel } from '../../dockview/dockviewGroupPanel';
23+
import { WatermarkRendererInitParameters } from '../../dockview/types';
2624

2725
enum GroupChangeKind2 {
2826
ADD_PANEL,
@@ -76,7 +74,7 @@ class Watermark implements IWatermarkRenderer {
7674
return 'watermark-id';
7775
}
7876

79-
init(params: GroupPanelPartInitParameters) {
77+
init(params: WatermarkRendererInitParameters) {
8078
//
8179
}
8280

@@ -170,7 +168,7 @@ class TestHeaderPart implements ITabRenderer {
170168

171169
export class TestPanel implements IDockviewPanel {
172170
private _group: DockviewGroupPanel | undefined;
173-
private _params: IGroupPanelInitParameters;
171+
private _params: IGroupPanelInitParameters | undefined;
174172
readonly view: IDockviewPanelModel;
175173

176174
get title() {
@@ -516,7 +514,7 @@ describe('groupview', () => {
516514
dockviewComponent,
517515
'id',
518516
{},
519-
null
517+
null as any
520518
);
521519

522520
expect(cut.toJSON()).toEqual({
@@ -539,7 +537,7 @@ describe('groupview', () => {
539537
dockviewComponent,
540538
'id',
541539
{},
542-
null
540+
null as any
543541
);
544542

545543
cut.locked = true;
@@ -568,25 +566,25 @@ describe('groupview', () => {
568566
dockviewComponent,
569567
'id',
570568
{},
571-
null
569+
null as any
572570
);
573571
const contentContainer = groupviewContainer
574572
.getElementsByClassName('content-container')
575573
.item(0)!.childNodes;
576574

577-
const panel1 = new TestPanel('id_1', null);
575+
const panel1 = new TestPanel('id_1', null as any);
578576

579577
cut.openPanel(panel1);
580578
expect(contentContainer.length).toBe(1);
581579
expect(contentContainer.item(0)).toBe(panel1.view.content.element);
582580

583-
const panel2 = new TestPanel('id_2', null);
581+
const panel2 = new TestPanel('id_2', null as any);
584582

585583
cut.openPanel(panel2);
586584
expect(contentContainer.length).toBe(1);
587585
expect(contentContainer.item(0)).toBe(panel2.view.content.element);
588586

589-
const panel3 = new TestPanel('id_2', null);
587+
const panel3 = new TestPanel('id_2', null as any);
590588

591589
cut.openPanel(panel3, { skipSetPanelActive: true });
592590
expect(contentContainer.length).toBe(1);

‎packages/dockview/jest.config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const config: JestConfigWithTsJest = {
2727
'^.+\\.tsx?$': [
2828
'ts-jest',
2929
{
30-
tsconfig,
30+
tsconfig: '<rootDir>/tsconfig.test.json',
3131
},
3232
],
3333
},

‎packages/dockview/src/__tests__/__test_utils__/utils.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import * as React from 'react';
2-
31
export function setMockRefElement(node: Partial<HTMLElement>): void {
42
const mockRef = {
53
get current() {
@@ -10,5 +8,5 @@ export function setMockRefElement(node: Partial<HTMLElement>): void {
108
},
119
};
1210

13-
jest.spyOn(React, 'useRef').mockReturnValueOnce(mockRef);
11+
jest.spyOn(require('react'), 'useRef').mockReturnValueOnce(mockRef);
1412
}

‎packages/dockview/src/__tests__/dockview/dockview.spec.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ describe('gridview react', () => {
4848

4949
render(<DockviewReact components={components} onReady={onReady} />);
5050

51-
expect(api.width).toBe(650);
52-
expect(api.height).toBe(450);
51+
expect(api!.width).toBe(650);
52+
expect(api!.height).toBe(450);
5353
});
5454
});

‎packages/dockview/src/__tests__/gridview/gridview.spec.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ describe('gridview react', () => {
5959
/>
6060
);
6161

62-
expect(api.width).toBe(650);
63-
expect(api.height).toBe(450);
62+
expect(api!.width).toBe(650);
63+
expect(api!.height).toBe(450);
6464
});
6565
});

‎packages/dockview/src/__tests__/paneview/paneview.spec.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ describe('gridview react', () => {
4646

4747
render(<PaneviewReact components={components} onReady={onReady} />);
4848

49-
expect(api.width).toBe(650);
50-
expect(api.height).toBe(450);
49+
expect(api!.width).toBe(650);
50+
expect(api!.height).toBe(450);
5151
});
5252
});

‎packages/dockview/src/__tests__/react.spec.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ describe('react', () => {
1818

1919
render(<TestWrapper onReady={onReady} component={Component} />);
2020

21-
expect(api).toBeTruthy();
21+
expect(api!).toBeTruthy();
2222

2323
expect(screen.getByTestId('valueA').textContent).toBe('stringA');
2424
expect(screen.getByTestId('valueB').textContent).toBe('42');
@@ -60,7 +60,7 @@ const TestWrapper = (props: {
6060

6161
React.useEffect(() => {
6262
const cut = new ReactPart<TestInterface>(
63-
ref.current,
63+
ref.current!,
6464
{
6565
addPortal: (portal: React.ReactPortal) => {
6666
setPortal((_) => [..._, portal]);

‎packages/dockview/src/__tests__/react/dockview/dockview.spec.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ describe('dockview', () => {
4747

4848
render(<DockviewReact components={components} onReady={onReady} />);
4949

50-
expect(api.width).toBe(650);
51-
expect(api.height).toBe(450);
50+
expect(api!.width).toBe(650);
51+
expect(api!.height).toBe(450);
5252
});
5353
});

‎packages/dockview/src/__tests__/react/gridview/gridview.spec.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ describe('gridview react', () => {
5858
/>
5959
);
6060

61-
expect(api.width).toBe(650);
62-
expect(api.height).toBe(450);
61+
expect(api!.width).toBe(650);
62+
expect(api!.height).toBe(450);
6363
});
6464
});

‎packages/dockview/src/__tests__/react/paneview/paneview.spec.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ describe('gridview react', () => {
4646

4747
render(<PaneviewReact components={components} onReady={onReady} />);
4848

49-
expect(api.width).toBe(650);
50-
expect(api.height).toBe(450);
49+
expect(api!.width).toBe(650);
50+
expect(api!.height).toBe(450);
5151
});
5252
});

‎packages/dockview/src/__tests__/react/react.spec.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ describe('react', () => {
1818

1919
render(<TestWrapper onReady={onReady} component={Component} />);
2020

21-
expect(api).toBeTruthy();
21+
expect(api!).toBeTruthy();
2222

2323
expect(screen.getByTestId('valueA').textContent).toBe('stringA');
2424
expect(screen.getByTestId('valueB').textContent).toBe('42');
@@ -60,7 +60,7 @@ const TestWrapper = (props: {
6060

6161
React.useEffect(() => {
6262
const cut = new ReactPart<TestInterface>(
63-
ref.current,
63+
ref.current!,
6464
{
6565
addPortal: (portal: React.ReactPortal) => {
6666
setPortal((_) => [..._, portal]);

‎packages/dockview/src/__tests__/react/splitview/splitview.spec.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ describe('splitview react', () => {
5858
/>
5959
);
6060

61-
expect(api.width).toBe(650);
62-
expect(api.height).toBe(450);
61+
expect(api!.width).toBe(650);
62+
expect(api!.height).toBe(450);
6363
});
6464
});

‎packages/dockview/src/__tests__/splitview/splitview.spec.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ describe('splitview react', () => {
5858
/>
5959
);
6060

61-
expect(api.width).toBe(650);
62-
expect(api.height).toBe(450);
61+
expect(api!.width).toBe(650);
62+
expect(api!.height).toBe(450);
6363
});
6464
});

‎tsconfig.base.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,6 @@
2121
"ES2019",
2222
"DOM"
2323
]
24-
}
24+
},
25+
"exclude": ["**/*.spec.ts"]
2526
}

‎tsconfig.test.json

+4-19
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,7 @@
1-
21
{
2+
"extends": "./tsconfig.base.json",
33
"compilerOptions": {
4-
"module": "commonjs",
5-
"target": "es2019",
6-
"sourceMap": true,
7-
"declaration": true,
8-
"jsx": "react",
9-
"noImplicitReturns": true,
10-
"noImplicitAny": true,
11-
"allowUnreachableCode": false,
12-
"forceConsistentCasingInFileNames": true,
13-
// "strict": true,
14-
"strictBindCallApply": true, // pass
15-
"alwaysStrict": true, // pass
16-
"noImplicitThis": true, // pass
17-
"strictFunctionTypes": true, // pass
18-
"strictNullChecks": false,
19-
"strictPropertyInitialization": false,
4+
"jsx": "react-jsx"
205
},
21-
"exclude": ["node_modules", "dist"]
22-
}
6+
"include": ["**/*.spec.ts"]
7+
}

0 commit comments

Comments
 (0)