Skip to content

Commit 1425de3

Browse files
tangjinzhoutangjinzhou
committed
test: update modal snap
1 parent 9e4b2f4 commit 1425de3

File tree

4 files changed

+81
-41
lines changed

4 files changed

+81
-41
lines changed

‎components/modal/__tests__/Modal.test.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@ const ModalTester = {
1212
},
1313
render() {
1414
const modalProps = {
15-
props: {
16-
...this.$props,
17-
getContainer: this.getContainer,
18-
},
15+
...this.$props,
16+
getContainer: this.getContainer,
1917
};
2018
return (
2119
<div>

‎components/modal/__tests__/__snapshots__/Modal.test.js.snap

Lines changed: 34 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,27 @@ exports[`Modal render correctly 1`] = `
55
<div>
66
<div>
77
<div class="ant-modal-root">
8-
<div class="ant-modal-mask"></div>
9-
<div tabindex="-1" role="dialog" class="ant-modal-wrap ">
10-
<div role="document" class="ant-modal" style="width: 520px;">
11-
<div tabindex="0" aria-hidden="true" style="width: 0px; height: 0px; overflow: hidden;"></div>
12-
<div class="ant-modal-content"><button type="button" aria-label="Close" class="ant-modal-close"><span class="ant-modal-close-x"><span role="img" aria-label="close" class="anticon anticon-close ant-modal-close-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="close" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 00203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"></path></svg></span></span></button>
8+
<div class="ant-modal-mask fade-enter"></div>
9+
<div tabindex="-1" class="ant-modal-wrap" role="dialog">
10+
<div role="document" style="width: 520px;" class="ant-modal zoom-enter">
11+
<div tabindex="0" style="width: 0px; height: 0px; overflow: hidden;" aria-hidden="true"></div>
12+
<div class="ant-modal-content"><button type="button" aria-label="Close" class="ant-modal-close"><span class="ant-modal-close-x"><span role="img" aria-label="close" class="anticon anticon-close ant-modal-close-icon"><svg class="" data-icon="close" width="1em" height="1em" fill="currentColor" aria-hidden="true" viewBox="64 64 896 896" focusable="false"><path d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 00203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"></path></svg></span></span></button>
13+
<!---->
1314
<div class="ant-modal-body">Here is content of Modal</div>
1415
<div class="ant-modal-footer">
15-
<div><button type="button" class="ant-btn"><span>Cancel</span></button><button type="button" class="ant-btn ant-btn-primary"><span>OK</span></button></div>
16+
<div><button class="ant-btn" type="button">
17+
<!----><span>Cancel</span></button><button class="ant-btn ant-btn-primary" type="button">
18+
<!----><span>OK</span></button></div>
1619
</div>
1720
</div>
18-
<div tabindex="0" aria-hidden="true" style="width: 0px; height: 0px; overflow: hidden;"></div>
21+
<div tabindex="0" style="width: 0px; height: 0px; overflow: hidden;" aria-hidden="true"></div>
1922
</div>
2023
</div>
2124
</div>
2225
</div>
2326
</div>
27+
<!--teleport start-->
28+
<!--teleport end-->
2429
</div>
2530
`;
2631

@@ -29,22 +34,27 @@ exports[`Modal render correctly 2`] = `
2934
<div>
3035
<div>
3136
<div class="ant-modal-root">
32-
<div class="ant-modal-mask"></div>
33-
<div tabindex="-1" role="dialog" class="ant-modal-wrap ">
34-
<div role="document" class="ant-modal" style="width: 520px;">
35-
<div tabindex="0" aria-hidden="true" style="width: 0px; height: 0px; overflow: hidden;"></div>
36-
<div class="ant-modal-content"><button type="button" aria-label="Close" class="ant-modal-close"><span class="ant-modal-close-x"><span role="img" aria-label="close" class="anticon anticon-close ant-modal-close-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="close" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 00203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"></path></svg></span></span></button>
37+
<div class="ant-modal-mask fade-enter"></div>
38+
<div tabindex="-1" class="ant-modal-wrap" role="dialog">
39+
<div role="document" style="width: 520px;" class="ant-modal zoom-enter">
40+
<div tabindex="0" style="width: 0px; height: 0px; overflow: hidden;" aria-hidden="true"></div>
41+
<div class="ant-modal-content"><button type="button" aria-label="Close" class="ant-modal-close"><span class="ant-modal-close-x"><span role="img" aria-label="close" class="anticon anticon-close ant-modal-close-icon"><svg class="" data-icon="close" width="1em" height="1em" fill="currentColor" aria-hidden="true" viewBox="64 64 896 896" focusable="false"><path d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 00203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"></path></svg></span></span></button>
42+
<!---->
3743
<div class="ant-modal-body">Here is content of Modal</div>
3844
<div class="ant-modal-footer">
39-
<div><button type="button" class="ant-btn"><span>Cancel</span></button><button type="button" class="ant-btn ant-btn-primary"><span>OK</span></button></div>
45+
<div><button class="ant-btn" type="button">
46+
<!----><span>Cancel</span></button><button class="ant-btn ant-btn-primary" type="button">
47+
<!----><span>OK</span></button></div>
4048
</div>
4149
</div>
42-
<div tabindex="0" aria-hidden="true" style="width: 0px; height: 0px; overflow: hidden;"></div>
50+
<div tabindex="0" style="width: 0px; height: 0px; overflow: hidden;" aria-hidden="true"></div>
4351
</div>
4452
</div>
4553
</div>
4654
</div>
4755
</div>
56+
<!--teleport start-->
57+
<!--teleport end-->
4858
</div>
4959
`;
5060

@@ -53,18 +63,22 @@ exports[`Modal render without footer 1`] = `
5363
<div>
5464
<div>
5565
<div class="ant-modal-root">
56-
<div class="ant-modal-mask"></div>
57-
<div tabindex="-1" role="dialog" class="ant-modal-wrap ">
58-
<div role="document" class="ant-modal" style="width: 520px;">
59-
<div tabindex="0" aria-hidden="true" style="width: 0px; height: 0px; overflow: hidden;"></div>
60-
<div class="ant-modal-content"><button type="button" aria-label="Close" class="ant-modal-close"><span class="ant-modal-close-x"><span role="img" aria-label="close" class="anticon anticon-close ant-modal-close-icon"><svg viewBox="64 64 896 896" focusable="false" data-icon="close" width="1em" height="1em" fill="currentColor" aria-hidden="true" class=""><path d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 00203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"></path></svg></span></span></button>
66+
<div class="ant-modal-mask fade-enter"></div>
67+
<div tabindex="-1" class="ant-modal-wrap" role="dialog">
68+
<div role="document" style="width: 520px;" class="ant-modal zoom-enter">
69+
<div tabindex="0" style="width: 0px; height: 0px; overflow: hidden;" aria-hidden="true"></div>
70+
<div class="ant-modal-content"><button type="button" aria-label="Close" class="ant-modal-close"><span class="ant-modal-close-x"><span role="img" aria-label="close" class="anticon anticon-close ant-modal-close-icon"><svg class="" data-icon="close" width="1em" height="1em" fill="currentColor" aria-hidden="true" viewBox="64 64 896 896" focusable="false"><path d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 00203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"></path></svg></span></span></button>
71+
<!---->
6172
<div class="ant-modal-body">Here is content of Modal</div>
73+
<!---->
6274
</div>
63-
<div tabindex="0" aria-hidden="true" style="width: 0px; height: 0px; overflow: hidden;"></div>
75+
<div tabindex="0" style="width: 0px; height: 0px; overflow: hidden;" aria-hidden="true"></div>
6476
</div>
6577
</div>
6678
</div>
6779
</div>
6880
</div>
81+
<!--teleport start-->
82+
<!--teleport end-->
6983
</div>
7084
`;

‎components/modal/__tests__/__snapshots__/demo.test.js.snap

Lines changed: 41 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,75 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

33
exports[`renders ./antdv-demo/docs/modal/demo/async.md correctly 1`] = `
4-
<div><button type="button" class="ant-btn ant-btn-primary"><span>Open Modal with async logic</span></button>
4+
<div><button class="ant-btn ant-btn-primary" type="button">
5+
<!----><span>Open Modal with async logic</span></button>
56
<!---->
67
</div>
78
`;
89

910
exports[`renders ./antdv-demo/docs/modal/demo/basic.md correctly 1`] = `
10-
<div><button type="button" class="ant-btn ant-btn-primary"><span>Open Modal</span></button>
11+
<div><button class="ant-btn ant-btn-primary" type="button">
12+
<!----><span>Open Modal</span></button>
1113
<!---->
1214
</div>
1315
`;
1416

1517
exports[`renders ./antdv-demo/docs/modal/demo/button-props.md correctly 1`] = `
16-
<div><button type="button" class="ant-btn ant-btn-primary"><span>Open Modal with customized button props</span></button>
18+
<div><button class="ant-btn ant-btn-primary" type="button">
19+
<!----><span>Open Modal with customized button props</span></button>
1720
<!---->
1821
</div>
1922
`;
2023

21-
exports[`renders ./antdv-demo/docs/modal/demo/confirm.md correctly 1`] = `<div><button type="button" class="ant-btn"><span>Confirm</span></button> <button type="button" class="ant-btn ant-btn-dashed"><span>Delete</span></button> <button type="button" class="ant-btn ant-btn-dashed"><span>With extra props</span></button></div>`;
24+
exports[`renders ./antdv-demo/docs/modal/demo/confirm.md correctly 1`] = `
25+
<div><button class="ant-btn" type="button">
26+
<!----><span>Confirm</span></button><button class="ant-btn ant-btn-dashed" type="button">
27+
<!----><span>Delete</span></button><button class="ant-btn ant-btn-dashed" type="button">
28+
<!----><span>With extra props</span></button></div>
29+
`;
2230

23-
exports[`renders ./antdv-demo/docs/modal/demo/confirm-promise.md correctly 1`] = `<button type="button" class="ant-btn"><span>Confirm</span></button>`;
31+
exports[`renders ./antdv-demo/docs/modal/demo/confirm-promise.md correctly 1`] = `
32+
<button class="ant-btn" type="button">
33+
<!----><span>Confirm</span></button>
34+
`;
2435

25-
exports[`renders ./antdv-demo/docs/modal/demo/confirm-router.md correctly 1`] = `<button type="button" class="ant-btn"><span>Confirm</span></button>`;
36+
exports[`renders ./antdv-demo/docs/modal/demo/confirm-router.md correctly 1`] = `
37+
<button class="ant-btn" type="button">
38+
<!----><span>Confirm</span></button>
39+
`;
2640

2741
exports[`renders ./antdv-demo/docs/modal/demo/footer.md correctly 1`] = `
28-
<div><button type="button" class="ant-btn ant-btn-primary"><span>Open Modal with customized footer</span></button>
42+
<div><button class="ant-btn ant-btn-primary" type="button">
43+
<!----><span>Open Modal with customized footer</span></button>
2944
<!---->
3045
</div>
3146
`;
3247

33-
exports[`renders ./antdv-demo/docs/modal/demo/info.md correctly 1`] = `<div><button type="button" class="ant-btn"><span>Info</span></button> <button type="button" class="ant-btn"><span>Success</span></button> <button type="button" class="ant-btn"><span>Error</span></button> <button type="button" class="ant-btn"><span>Warning</span></button></div>`;
48+
exports[`renders ./antdv-demo/docs/modal/demo/info.md correctly 1`] = `
49+
<div><button class="ant-btn" type="button">
50+
<!----><span>Info</span></button><button class="ant-btn" type="button">
51+
<!----><span>Success</span></button><button class="ant-btn" type="button">
52+
<!----><span>Error</span></button><button class="ant-btn" type="button">
53+
<!----><span>Warning</span></button></div>
54+
`;
3455

3556
exports[`renders ./antdv-demo/docs/modal/demo/locale.md correctly 1`] = `
36-
<div><button type="button" class="ant-btn ant-btn-primary"><span>Modal</span></button>
37-
<!----> <br> <br> <button type="button" class="ant-btn"><span>Confirm</span></button></div>
57+
<div><button class="ant-btn ant-btn-primary" type="button">
58+
<!----><span>Modal</span></button>
59+
<!----><br><br><button class="ant-btn" type="button">
60+
<!----><span>Confirm</span></button></div>
3861
`;
3962
40-
exports[`renders ./antdv-demo/docs/modal/demo/manual.md correctly 1`] = `<button type="button" class="ant-btn"><span>Open modal to close in 5s</span></button>`;
63+
exports[`renders ./antdv-demo/docs/modal/demo/manual.md correctly 1`] = `
64+
<button class="ant-btn" type="button">
65+
<!----><span>Open modal to close in 5s</span></button>
66+
`;
4167
4268
exports[`renders ./antdv-demo/docs/modal/demo/position.md correctly 1`] = `
43-
<div id="components-modal-demo-position"><button type="button" class="ant-btn ant-btn-primary"><span>Display a modal dialog at 20px to Top</span></button>
44-
<!----> <br><br> <button type="button" class="ant-btn ant-btn-primary"><span>Vertically centered modal dialog</span></button>
69+
<div id="components-modal-demo-position"><button class="ant-btn ant-btn-primary" type="button">
70+
<!----><span>Display a modal dialog at 20px to Top</span></button>
71+
<!----><br><br><button class="ant-btn ant-btn-primary" type="button">
72+
<!----><span>Vertically centered modal dialog</span></button>
4573
<!---->
4674
</div>
4775
`;

‎components/modal/__tests__/confirm.test.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,16 @@ describe('Modal.confirm triggers callbacks correctly', () => {
7979

8080
it('allows extra props on buttons', async () => {
8181
open({
82-
okButtonProps: { props: { disabled: true } },
83-
cancelButtonProps: { attrs: { 'data-test': 'baz' } },
82+
okButtonProps: { disabled: true },
83+
cancelButtonProps: { 'data-test': 'baz' },
8484
});
8585
await sleep();
8686
expect($$('.ant-btn')).toHaveLength(2);
8787
expect($$('.ant-btn')[0].attributes['data-test'].value).toBe('baz');
8888
expect($$('.ant-btn')[1].disabled).toBe(true);
8989
});
9090

91-
fit('trigger onCancel once when click on cancel button', async () => {
91+
it('trigger onCancel once when click on cancel button', async () => {
9292
const arr = ['info', 'success', 'warning', 'error'];
9393
for (let type of arr) {
9494
Modal[type]({
@@ -98,7 +98,7 @@ describe('Modal.confirm triggers callbacks correctly', () => {
9898
await sleep();
9999
expect($$(`.ant-modal-confirm-${type}`)).toHaveLength(1);
100100
$$('.ant-btn')[0].click();
101-
await sleep();
101+
await sleep(500);
102102
expect($$(`.ant-modal-confirm-${type}`)).toHaveLength(0);
103103
}
104104
});

0 commit comments

Comments
 (0)