Skip to content

Commit e701b7f

Browse files
setchysetchy
committed
test: refactor render with app context
Signed-off-by: Adam Setch <[email protected]>
1 parent 9b25f8d commit e701b7f

16 files changed

+131
-156
lines changed

‎src/renderer/__helpers__/test-utils.tsx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,13 @@ export function AppContextProvider({
2727
const defaultValue: Partial<AppContextState> = useMemo(() => {
2828
return {
2929
auth: mockAuth,
30+
settings: mockSettings,
31+
32+
notifications: [],
3033

3134
status: 'success',
3235
globalError: null,
3336

34-
settings: mockSettings,
35-
3637
...value,
3738
} as Partial<AppContextState>;
3839
}, [value]);

‎src/renderer/components/AllRead.test.tsx‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ describe('renderer/components/AllRead.tsx', () => {
1515

1616
await act(async () => {
1717
tree = renderWithAppContext(<AllRead />, {
18-
19-
settings: {
20-
...mockSettings } });
18+
settings: {
19+
...mockSettings,
20+
},
21+
});
2122
});
2223

2324
expect(tree).toMatchSnapshot();
@@ -28,10 +29,11 @@ describe('renderer/components/AllRead.tsx', () => {
2829

2930
await act(async () => {
3031
tree = renderWithAppContext(<AllRead />, {
31-
32-
settings: {
33-
...mockSettings,
34-
filterReasons: ['author'] } });
32+
settings: {
33+
...mockSettings,
34+
filterReasons: ['author'],
35+
},
36+
});
3537
});
3638

3739
expect(tree).toMatchSnapshot();

‎src/renderer/components/Sidebar.test.tsx‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ describe('renderer/components/Sidebar.tsx', () => {
3030
<Sidebar />
3131
</MemoryRouter>,
3232
{
33-
notifications: mockAccountNotifications,
33+
isLoggedIn: true,
3434
},
3535
);
3636

@@ -44,7 +44,6 @@ describe('renderer/components/Sidebar.tsx', () => {
4444
</MemoryRouter>,
4545
{
4646
isLoggedIn: false,
47-
notifications: mockAccountNotifications,
4847
},
4948
);
5049

@@ -58,7 +57,6 @@ describe('renderer/components/Sidebar.tsx', () => {
5857
</MemoryRouter>,
5958
{
6059
isLoggedIn: false,
61-
notifications: [],
6260
},
6361
);
6462

@@ -75,7 +73,6 @@ describe('renderer/components/Sidebar.tsx', () => {
7573
</MemoryRouter>,
7674
{
7775
isLoggedIn: true,
78-
notifications: [],
7976
},
8077
);
8178

@@ -108,7 +105,7 @@ describe('renderer/components/Sidebar.tsx', () => {
108105
</MemoryRouter>,
109106
{
110107
isLoggedIn: true,
111-
notifications: [],
108+
notifications: mockAccountNotifications,
112109
},
113110
);
114111

@@ -124,7 +121,6 @@ describe('renderer/components/Sidebar.tsx', () => {
124121
</MemoryRouter>,
125122
{
126123
isLoggedIn: true,
127-
notifications: [],
128124
},
129125
);
130126

@@ -140,7 +136,6 @@ describe('renderer/components/Sidebar.tsx', () => {
140136
</MemoryRouter>,
141137
{
142138
isLoggedIn: true,
143-
notifications: [],
144139
},
145140
);
146141

@@ -236,7 +231,6 @@ describe('renderer/components/Sidebar.tsx', () => {
236231
</MemoryRouter>,
237232
{
238233
isLoggedIn: true,
239-
notifications: [],
240234
},
241235
);
242236

@@ -252,7 +246,6 @@ describe('renderer/components/Sidebar.tsx', () => {
252246
</MemoryRouter>,
253247
{
254248
isLoggedIn: true,
255-
notifications: [],
256249
fetchNotifications: mockFetchNotifications,
257250
},
258251
);
@@ -273,9 +266,6 @@ describe('renderer/components/Sidebar.tsx', () => {
273266
</MemoryRouter>,
274267
{
275268
isLoggedIn: false,
276-
notifications: [],
277-
auth: mockAuth,
278-
settings: mockSettings,
279269
},
280270
);
281271

‎src/renderer/components/filters/FilterSection.test.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ describe('renderer/components/filters/FilterSection.tsx', () => {
8181
...mockSettings,
8282
filterStates: [],
8383
},
84-
notifications: [],
8584
updateFilter: mockUpdateFilter,
8685
},
8786
);
@@ -115,7 +114,6 @@ describe('renderer/components/filters/FilterSection.tsx', () => {
115114
...mockSettings,
116115
filterStates: ['open'],
117116
},
118-
notifications: [],
119117
updateFilter: mockUpdateFilter,
120118
},
121119
);

‎src/renderer/components/filters/ReasonFilter.test.tsx‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
import { renderWithAppContext } from '../../__helpers__/test-utils';
2-
import { mockAccountNotifications } from '../../__mocks__/notifications-mocks';
3-
import { mockSettings } from '../../__mocks__/state-mocks';
42
import { ReasonFilter } from './ReasonFilter';
53

64
describe('renderer/components/filters/ReasonFilter.tsx', () => {
75
it('should render itself & its children', () => {
8-
const tree = renderWithAppContext(<ReasonFilter />, {
9-
settings: mockSettings,
10-
notifications: mockAccountNotifications,
11-
});
6+
const tree = renderWithAppContext(<ReasonFilter />);
127

138
expect(tree).toMatchSnapshot();
149
});

‎src/renderer/components/filters/RequiresDetailedNotificationsWarning.test.tsx‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
import { renderWithAppContext } from '../../__helpers__/test-utils';
2-
import { mockAccountNotifications } from '../../__mocks__/notifications-mocks';
3-
import { mockSettings } from '../../__mocks__/state-mocks';
42
import { RequiresDetailedNotificationWarning } from './RequiresDetailedNotificationsWarning';
53

64
describe('renderer/components/filters/RequiresDetailedNotificationsWarning.tsx', () => {
75
it('should render itself & its children', () => {
8-
const tree = renderWithAppContext(<RequiresDetailedNotificationWarning />, {
9-
10-
settings: mockSettings,
11-
notifications: mockAccountNotifications });
6+
const tree = renderWithAppContext(<RequiresDetailedNotificationWarning />);
127

138
expect(tree).toMatchSnapshot();
149
});

‎src/renderer/components/filters/SearchFilterSuggestions.test.tsx‎

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ describe('renderer/components/filters/SearchFilterSuggestions.tsx', () => {
88
const tree = renderWithAppContext(
99
<SearchFilterSuggestions inputValue={''} open={false} />,
1010
{
11-
12-
settings: {
13-
...mockSettings,
14-
detailedNotifications: false } as SettingsState },
11+
settings: {
12+
...mockSettings,
13+
detailedNotifications: false,
14+
} as SettingsState,
15+
},
1516
);
1617

1718
expect(tree).toMatchSnapshot();
@@ -21,10 +22,11 @@ describe('renderer/components/filters/SearchFilterSuggestions.tsx', () => {
2122
const tree = renderWithAppContext(
2223
<SearchFilterSuggestions inputValue={''} open={true} />,
2324
{
24-
25-
settings: {
26-
...mockSettings,
27-
detailedNotifications: true } as SettingsState },
25+
settings: {
26+
...mockSettings,
27+
detailedNotifications: true,
28+
} as SettingsState,
29+
},
2830
);
2931

3032
expect(tree).toMatchSnapshot();
@@ -34,10 +36,11 @@ describe('renderer/components/filters/SearchFilterSuggestions.tsx', () => {
3436
const tree = renderWithAppContext(
3537
<SearchFilterSuggestions inputValue={''} open={true} />,
3638
{
37-
38-
settings: {
39-
...mockSettings,
40-
detailedNotifications: true } as SettingsState },
39+
settings: {
40+
...mockSettings,
41+
detailedNotifications: true,
42+
} as SettingsState,
43+
},
4144
);
4245

4346
expect(tree).toMatchSnapshot();
@@ -47,10 +50,11 @@ describe('renderer/components/filters/SearchFilterSuggestions.tsx', () => {
4750
const tree = renderWithAppContext(
4851
<SearchFilterSuggestions inputValue={'invalid'} open={true} />,
4952
{
50-
51-
settings: {
52-
...mockSettings,
53-
detailedNotifications: false } as SettingsState },
53+
settings: {
54+
...mockSettings,
55+
detailedNotifications: false,
56+
} as SettingsState,
57+
},
5458
);
5559

5660
expect(tree).toMatchSnapshot();
@@ -60,10 +64,11 @@ describe('renderer/components/filters/SearchFilterSuggestions.tsx', () => {
6064
const tree = renderWithAppContext(
6165
<SearchFilterSuggestions inputValue={'repo:'} open={true} />,
6266
{
63-
64-
settings: {
65-
...mockSettings,
66-
detailedNotifications: false } as SettingsState },
67+
settings: {
68+
...mockSettings,
69+
detailedNotifications: false,
70+
} as SettingsState,
71+
},
6772
);
6873

6974
expect(tree).toMatchSnapshot();

‎src/renderer/components/filters/StateFilter.test.tsx‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
11
import { renderWithAppContext } from '../../__helpers__/test-utils';
2-
import { mockAccountNotifications } from '../../__mocks__/notifications-mocks';
3-
import { mockSettings } from '../../__mocks__/state-mocks';
4-
import type { SettingsState } from '../../types';
52
import { StateFilter } from './StateFilter';
63

74
describe('renderer/components/filters/StateFilter.tsx', () => {
85
it('should render itself & its children', () => {
9-
const tree = renderWithAppContext(<StateFilter />, {
10-
11-
settings: {
12-
...mockSettings,
13-
detailedNotifications: true } as SettingsState,
14-
notifications: mockAccountNotifications });
6+
const tree = renderWithAppContext(<StateFilter />);
157

168
expect(tree).toMatchSnapshot();
179
});

‎src/renderer/components/filters/SubjectTypeFilter.test.tsx‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
11
import { renderWithAppContext } from '../../__helpers__/test-utils';
2-
import { mockAccountNotifications } from '../../__mocks__/notifications-mocks';
3-
import { mockSettings } from '../../__mocks__/state-mocks';
4-
import type { SettingsState } from '../../types';
52
import { SubjectTypeFilter } from './SubjectTypeFilter';
63

74
describe('renderer/components/filters/SubjectTypeFilter.tsx', () => {
85
it('should render itself & its children', () => {
9-
const tree = renderWithAppContext(<SubjectTypeFilter />, {
10-
11-
settings: {
12-
...mockSettings } as SettingsState,
13-
notifications: mockAccountNotifications });
6+
const tree = renderWithAppContext(<SubjectTypeFilter />);
147

158
expect(tree).toMatchSnapshot();
169
});

‎src/renderer/components/filters/UserTypeFilter.test.tsx‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ import { UserTypeFilter } from './UserTypeFilter';
77
describe('renderer/components/filters/UserTypeFilter.tsx', () => {
88
it('should render itself & its children', () => {
99
const tree = renderWithAppContext(<UserTypeFilter />, {
10-
11-
settings: {
12-
...mockSettings,
13-
detailedNotifications: true } as SettingsState,
14-
notifications: mockAccountNotifications });
10+
settings: {
11+
...mockSettings,
12+
detailedNotifications: true,
13+
} as SettingsState,
14+
notifications: mockAccountNotifications,
15+
});
1516

1617
expect(tree).toMatchSnapshot();
1718
});

0 commit comments

Comments
 (0)