Skip to content

Commit f6a2ca2

Browse files
jdufresnejdufresne
authored
chore: improve jest tests with more precise assertions (#1912)
1 parent db05c57 commit f6a2ca2

10 files changed

+149
-137
lines changed

‎lib/path.test.js

+22-22
Original file line numberDiff line numberDiff line change
@@ -8,55 +8,55 @@ const { parsePathData, stringifyPathData } = require('./path.js');
88

99
describe('parse path data', () => {
1010
it('should allow spaces between commands', () => {
11-
expect(parsePathData('M0 10 L \n\r\t20 30')).toEqual([
11+
expect(parsePathData('M0 10 L \n\r\t20 30')).toStrictEqual([
1212
{ command: 'M', args: [0, 10] },
1313
{ command: 'L', args: [20, 30] },
1414
]);
1515
});
1616
it('should allow spaces and commas between arguments', () => {
17-
expect(parsePathData('M0 , 10 L 20 \n\r\t30,40,50')).toEqual([
17+
expect(parsePathData('M0 , 10 L 20 \n\r\t30,40,50')).toStrictEqual([
1818
{ command: 'M', args: [0, 10] },
1919
{ command: 'L', args: [20, 30] },
2020
{ command: 'L', args: [40, 50] },
2121
]);
2222
});
2323
it('should forbid commas before commands', () => {
24-
expect(parsePathData(', M0 10')).toEqual([]);
24+
expect(parsePathData(', M0 10')).toStrictEqual([]);
2525
});
2626
it('should forbid commas between commands', () => {
27-
expect(parsePathData('M0,10 , L 20,30')).toEqual([
27+
expect(parsePathData('M0,10 , L 20,30')).toStrictEqual([
2828
{ command: 'M', args: [0, 10] },
2929
]);
3030
});
3131
it('should forbid commas between command name and argument', () => {
32-
expect(parsePathData('M0,10 L,20,30')).toEqual([
32+
expect(parsePathData('M0,10 L,20,30')).toStrictEqual([
3333
{ command: 'M', args: [0, 10] },
3434
]);
3535
});
3636
it('should forbid multiple commas in a row', () => {
37-
expect(parsePathData('M0 , , 10')).toEqual([]);
37+
expect(parsePathData('M0 , , 10')).toStrictEqual([]);
3838
});
3939
it('should stop when unknown char appears', () => {
40-
expect(parsePathData('M0 10 , L 20 #40')).toEqual([
40+
expect(parsePathData('M0 10 , L 20 #40')).toStrictEqual([
4141
{ command: 'M', args: [0, 10] },
4242
]);
4343
});
4444
it('should stop when not enough arguments', () => {
45-
expect(parsePathData('M0 10 L 20 L 30 40')).toEqual([
45+
expect(parsePathData('M0 10 L 20 L 30 40')).toStrictEqual([
4646
{ command: 'M', args: [0, 10] },
4747
]);
4848
});
4949
it('should stop if moveto not the first command', () => {
50-
expect(parsePathData('L 10 20')).toEqual([]);
51-
expect(parsePathData('10 20')).toEqual([]);
50+
expect(parsePathData('L 10 20')).toStrictEqual([]);
51+
expect(parsePathData('10 20')).toStrictEqual([]);
5252
});
5353
it('should stop on invalid scientific notation', () => {
54-
expect(parsePathData('M 0 5e++1 L 0 0')).toEqual([
54+
expect(parsePathData('M 0 5e++1 L 0 0')).toStrictEqual([
5555
{ command: 'M', args: [0, 5] },
5656
]);
5757
});
5858
it('should stop on invalid numbers', () => {
59-
expect(parsePathData('M ...')).toEqual([]);
59+
expect(parsePathData('M ...')).toStrictEqual([]);
6060
});
6161
it('should handle arcs', () => {
6262
expect(
@@ -71,7 +71,7 @@ describe('parse path data', () => {
7171
l 50,-25
7272
`,
7373
),
74-
).toEqual([
74+
).toStrictEqual([
7575
{ command: 'M', args: [600, 350] },
7676
{ command: 'l', args: [50, -25] },
7777
{ command: 'a', args: [25, 25, -30, 0, 1, 50, -25] },
@@ -96,7 +96,7 @@ describe('stringify path data', () => {
9696
{ command: 'H', args: [50] },
9797
],
9898
}),
99-
).toEqual('M0 0h10 20 30H40 50');
99+
).toBe('M0 0h10 20 30H40 50');
100100
});
101101
it('should not combine sequence of moveto', () => {
102102
expect(
@@ -108,7 +108,7 @@ describe('stringify path data', () => {
108108
{ command: 'm', args: [40, 50] },
109109
],
110110
}),
111-
).toEqual('M0 0M10 10m20 30m40 50');
111+
).toBe('M0 0M10 10m20 30m40 50');
112112
});
113113
it('should combine moveto and sequence of lineto', () => {
114114
expect(
@@ -122,15 +122,15 @@ describe('stringify path data', () => {
122122
{ command: 'L', args: [10, 10] },
123123
],
124124
}),
125-
).toEqual('m0 0 10 10M0 0l10 10M0 0 10 10');
125+
).toBe('m0 0 10 10M0 0l10 10M0 0 10 10');
126126
expect(
127127
stringifyPathData({
128128
pathData: [
129129
{ command: 'm', args: [0, 0] },
130130
{ command: 'L', args: [10, 10] },
131131
],
132132
}),
133-
).toEqual('M0 0 10 10');
133+
).toBe('M0 0 10 10');
134134
});
135135
it('should avoid space before first, negative and decimals', () => {
136136
expect(
@@ -142,7 +142,7 @@ describe('stringify path data', () => {
142142
{ command: 'L', args: [7, 0.8] },
143143
],
144144
}),
145-
).toEqual('M0-1.2.3 4 5-.6 7 .8');
145+
).toBe('M0-1.2.3 4 5-.6 7 .8');
146146
});
147147
it('should configure precision', () => {
148148
/**
@@ -159,13 +159,13 @@ describe('stringify path data', () => {
159159
pathData,
160160
precision: 3,
161161
}),
162-
).toEqual('M0-1.988.3 3.142-.3-3.142 100 200');
162+
).toBe('M0-1.988.3 3.142-.3-3.142 100 200');
163163
expect(
164164
stringifyPathData({
165165
pathData,
166166
precision: 0,
167167
}),
168-
).toEqual('M0-2 0 3 0-3 100 200');
168+
).toBe('M0-2 0 3 0-3 100 200');
169169
});
170170
it('allows to avoid spaces after arc flags', () => {
171171
/**
@@ -182,12 +182,12 @@ describe('stringify path data', () => {
182182
pathData,
183183
disableSpaceAfterFlags: false,
184184
}),
185-
).toEqual('M0 0A50 50 10 1 0 .2 20a50 50 10 1 0 .2 20 50 50 10 1 0 .2 20');
185+
).toBe('M0 0A50 50 10 1 0 .2 20a50 50 10 1 0 .2 20 50 50 10 1 0 .2 20');
186186
expect(
187187
stringifyPathData({
188188
pathData,
189189
disableSpaceAfterFlags: true,
190190
}),
191-
).toEqual('M0 0A50 50 10 10.2 20a50 50 10 10.2 20 50 50 10 10.2 20');
191+
).toBe('M0 0A50 50 10 10.2 20a50 50 10 10.2 20 50 50 10 10.2 20');
192192
});
193193
});

‎lib/style.test.js

+61-41
Original file line numberDiff line numberDiff line change
@@ -58,31 +58,35 @@ it('collects styles', () => {
5858
</svg>
5959
`);
6060
const stylesheet = collectStylesheet(root);
61-
expect(computeStyle(stylesheet, getElementById(root, 'class'))).toEqual({
62-
fill: { type: 'static', inherited: false, value: 'red' },
63-
});
64-
expect(computeStyle(stylesheet, getElementById(root, 'two-classes'))).toEqual(
61+
expect(computeStyle(stylesheet, getElementById(root, 'class'))).toStrictEqual(
6562
{
66-
fill: { type: 'static', inherited: false, value: 'green' },
67-
stroke: { type: 'static', inherited: false, value: 'black' },
63+
fill: { type: 'static', inherited: false, value: 'red' },
6864
},
6965
);
70-
expect(computeStyle(stylesheet, getElementById(root, 'attribute'))).toEqual({
66+
expect(
67+
computeStyle(stylesheet, getElementById(root, 'two-classes')),
68+
).toStrictEqual({
69+
fill: { type: 'static', inherited: false, value: 'green' },
70+
stroke: { type: 'static', inherited: false, value: 'black' },
71+
});
72+
expect(
73+
computeStyle(stylesheet, getElementById(root, 'attribute')),
74+
).toStrictEqual({
7175
fill: { type: 'static', inherited: false, value: 'purple' },
7276
});
7377
expect(
7478
computeStyle(stylesheet, getElementById(root, 'inline-style')),
75-
).toEqual({
79+
).toStrictEqual({
7680
fill: { type: 'static', inherited: false, value: 'grey' },
7781
});
78-
expect(computeStyle(stylesheet, getElementById(root, 'inheritance'))).toEqual(
79-
{
80-
fill: { type: 'static', inherited: true, value: 'yellow' },
81-
},
82-
);
82+
expect(
83+
computeStyle(stylesheet, getElementById(root, 'inheritance')),
84+
).toStrictEqual({
85+
fill: { type: 'static', inherited: true, value: 'yellow' },
86+
});
8387
expect(
8488
computeStyle(stylesheet, getElementById(root, 'nested-inheritance')),
85-
).toEqual({
89+
).toStrictEqual({
8690
fill: { type: 'static', inherited: true, value: 'blue' },
8791
});
8892
});
@@ -107,33 +111,33 @@ it('prioritizes different kinds of styles', () => {
107111
const stylesheet = collectStylesheet(root);
108112
expect(
109113
computeStyle(stylesheet, getElementById(root, 'complex-selector')),
110-
).toEqual({
114+
).toStrictEqual({
111115
fill: { type: 'static', inherited: false, value: 'red' },
112116
});
113117
expect(
114118
computeStyle(stylesheet, getElementById(root, 'override-selector')),
115-
).toEqual({
119+
).toStrictEqual({
116120
fill: { type: 'static', inherited: false, value: 'blue' },
117121
});
118122
expect(
119123
computeStyle(
120124
stylesheet,
121125
getElementById(root, 'attribute-over-inheritance'),
122126
),
123-
).toEqual({
127+
).toStrictEqual({
124128
fill: { type: 'static', inherited: false, value: 'orange' },
125129
});
126130
expect(
127131
computeStyle(stylesheet, getElementById(root, 'style-rule-over-attribute')),
128-
).toEqual({
132+
).toStrictEqual({
129133
fill: { type: 'static', inherited: false, value: 'blue' },
130134
});
131135
expect(
132136
computeStyle(
133137
stylesheet,
134138
getElementById(root, 'inline-style-over-style-rule'),
135139
),
136-
).toEqual({
140+
).toStrictEqual({
137141
fill: { type: 'static', inherited: false, value: 'purple' },
138142
});
139143
});
@@ -153,23 +157,23 @@ it('prioritizes important styles', () => {
153157
const stylesheet = collectStylesheet(root);
154158
expect(
155159
computeStyle(stylesheet, getElementById(root, 'complex-selector')),
156-
).toEqual({
160+
).toStrictEqual({
157161
fill: { type: 'static', inherited: false, value: 'green' },
158162
});
159163
expect(
160164
computeStyle(
161165
stylesheet,
162166
getElementById(root, 'style-rule-over-inline-style'),
163167
),
164-
).toEqual({
168+
).toStrictEqual({
165169
fill: { type: 'static', inherited: false, value: 'green' },
166170
});
167171
expect(
168172
computeStyle(
169173
stylesheet,
170174
getElementById(root, 'inline-style-over-style-rule'),
171175
),
172-
).toEqual({
176+
).toStrictEqual({
173177
fill: { type: 'static', inherited: false, value: 'purple' },
174178
});
175179
});
@@ -195,23 +199,29 @@ it('treats at-rules and pseudo-classes as dynamic styles', () => {
195199
</svg>
196200
`);
197201
const stylesheet = collectStylesheet(root);
198-
expect(computeStyle(stylesheet, getElementById(root, 'media-query'))).toEqual(
202+
expect(
203+
computeStyle(stylesheet, getElementById(root, 'media-query')),
204+
).toStrictEqual({
205+
fill: { type: 'dynamic', inherited: false },
206+
});
207+
expect(computeStyle(stylesheet, getElementById(root, 'hover'))).toStrictEqual(
199208
{
200209
fill: { type: 'dynamic', inherited: false },
201210
},
202211
);
203-
expect(computeStyle(stylesheet, getElementById(root, 'hover'))).toEqual({
204-
fill: { type: 'dynamic', inherited: false },
205-
});
206-
expect(computeStyle(stylesheet, getElementById(root, 'inherited'))).toEqual({
212+
expect(
213+
computeStyle(stylesheet, getElementById(root, 'inherited')),
214+
).toStrictEqual({
207215
fill: { type: 'dynamic', inherited: true },
208216
});
209217
expect(
210218
computeStyle(stylesheet, getElementById(root, 'inherited-overriden')),
211-
).toEqual({
219+
).toStrictEqual({
212220
fill: { type: 'static', inherited: false, value: 'blue' },
213221
});
214-
expect(computeStyle(stylesheet, getElementById(root, 'static'))).toEqual({
222+
expect(
223+
computeStyle(stylesheet, getElementById(root, 'static')),
224+
).toStrictEqual({
215225
fill: { type: 'static', inherited: false, value: 'black' },
216226
});
217227
});
@@ -234,17 +244,19 @@ it('considers <style> media attribute', () => {
234244
</svg>
235245
`);
236246
const stylesheet = collectStylesheet(root);
237-
expect(computeStyle(stylesheet, getElementById(root, 'media-query'))).toEqual(
238-
{
239-
fill: { type: 'dynamic', inherited: false },
240-
},
241-
);
247+
expect(
248+
computeStyle(stylesheet, getElementById(root, 'media-query')),
249+
).toStrictEqual({
250+
fill: { type: 'dynamic', inherited: false },
251+
});
242252
expect(
243253
computeStyle(stylesheet, getElementById(root, 'kinda-static')),
244-
).toEqual({
254+
).toStrictEqual({
245255
fill: { type: 'dynamic', inherited: false },
246256
});
247-
expect(computeStyle(stylesheet, getElementById(root, 'static'))).toEqual({
257+
expect(
258+
computeStyle(stylesheet, getElementById(root, 'static')),
259+
).toStrictEqual({
248260
fill: { type: 'static', inherited: false, value: 'blue' },
249261
});
250262
});
@@ -267,15 +279,19 @@ it('ignores <style> with invalid type', () => {
267279
</svg>
268280
`);
269281
const stylesheet = collectStylesheet(root);
270-
expect(computeStyle(stylesheet, getElementById(root, 'valid-type'))).toEqual({
282+
expect(
283+
computeStyle(stylesheet, getElementById(root, 'valid-type')),
284+
).toStrictEqual({
271285
fill: { type: 'static', inherited: false, value: 'red' },
272286
});
273-
expect(computeStyle(stylesheet, getElementById(root, 'empty-type'))).toEqual({
287+
expect(
288+
computeStyle(stylesheet, getElementById(root, 'empty-type')),
289+
).toStrictEqual({
274290
fill: { type: 'static', inherited: false, value: 'green' },
275291
});
276292
expect(
277293
computeStyle(stylesheet, getElementById(root, 'invalid-type')),
278-
).toEqual({});
294+
).toStrictEqual({});
279295
});
280296

281297
it('ignores keyframes atrule', () => {
@@ -301,7 +317,9 @@ it('ignores keyframes atrule', () => {
301317
</svg>
302318
`);
303319
const stylesheet = collectStylesheet(root);
304-
expect(computeStyle(stylesheet, getElementById(root, 'element'))).toEqual({
320+
expect(
321+
computeStyle(stylesheet, getElementById(root, 'element')),
322+
).toStrictEqual({
305323
animation: {
306324
type: 'static',
307325
inherited: false,
@@ -330,7 +348,9 @@ it('ignores @-webkit-keyframes atrule', () => {
330348
</svg>
331349
`);
332350
const stylesheet = collectStylesheet(root);
333-
expect(computeStyle(stylesheet, getElementById(root, 'element'))).toEqual({
351+
expect(
352+
computeStyle(stylesheet, getElementById(root, 'element')),
353+
).toStrictEqual({
334354
animation: {
335355
type: 'static',
336356
inherited: false,

0 commit comments

Comments
 (0)