Skip to content

Commit a3279ff

Browse files
zombieJzombieJ
committed
test: clean up
1 parent f123196 commit a3279ff

2 files changed

Lines changed: 81 additions & 146 deletions

File tree

‎tests/__snapshots__/index.spec.tsx.snap‎

Lines changed: 81 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -11,39 +11,30 @@ exports[`dialog add rootClassName and rootStyle should render correct 1`] = `
1111
<div
1212
class="rc-dialog-wrap"
1313
style="font-size: 10px;"
14-
tabindex="-1"
1514
>
1615
<div
1716
aria-modal="true"
1817
class="rc-dialog"
1918
role="dialog"
2019
style="width: 600px; height: 903px;"
20+
tabindex="-1"
2121
>
2222
<div
23-
style="outline: none;"
24-
tabindex="0"
23+
class="rc-dialog-container"
2524
>
26-
<div
27-
class="rc-dialog-container"
25+
<button
26+
aria-label="Close"
27+
class="rc-dialog-close"
28+
type="button"
2829
>
29-
<button
30-
aria-label="Close"
31-
class="rc-dialog-close"
32-
type="button"
33-
>
34-
<span
35-
class="rc-dialog-close-x"
36-
/>
37-
</button>
38-
<div
39-
class="rc-dialog-body"
30+
<span
31+
class="rc-dialog-close-x"
4032
/>
41-
</div>
33+
</button>
34+
<div
35+
class="rc-dialog-body"
36+
/>
4237
</div>
43-
<div
44-
style="width: 0px; height: 0px; overflow: hidden; outline: none;"
45-
tabindex="0"
46-
/>
4738
</div>
4839
</div>
4940
</div>
@@ -58,49 +49,40 @@ exports[`dialog should render correct 1`] = `
5849
/>
5950
<div
6051
class="rc-dialog-wrap"
61-
tabindex="-1"
6252
>
6353
<div
6454
aria-labelledby="test-id"
6555
aria-modal="true"
6656
class="rc-dialog"
6757
role="dialog"
58+
tabindex="-1"
6859
>
6960
<div
70-
style="outline: none;"
71-
tabindex="0"
61+
class="rc-dialog-container"
7262
>
63+
<button
64+
aria-label="Close"
65+
class="rc-dialog-close"
66+
type="button"
67+
>
68+
<span
69+
class="rc-dialog-close-x"
70+
/>
71+
</button>
7372
<div
74-
class="rc-dialog-container"
73+
class="rc-dialog-header"
7574
>
76-
<button
77-
aria-label="Close"
78-
class="rc-dialog-close"
79-
type="button"
80-
>
81-
<span
82-
class="rc-dialog-close-x"
83-
/>
84-
</button>
8575
<div
86-
class="rc-dialog-header"
76+
class="rc-dialog-title"
77+
id="test-id"
8778
>
88-
<div
89-
class="rc-dialog-title"
90-
id="test-id"
91-
>
92-
Default
93-
</div>
79+
Default
9480
</div>
95-
<div
96-
class="rc-dialog-body"
97-
/>
9881
</div>
82+
<div
83+
class="rc-dialog-body"
84+
/>
9985
</div>
100-
<div
101-
style="width: 0px; height: 0px; overflow: hidden; outline: none;"
102-
tabindex="0"
103-
/>
10486
</div>
10587
</div>
10688
</div>
@@ -115,55 +97,46 @@ exports[`dialog should support classNames 1`] = `
11597
/>
11698
<div
11799
class="rc-dialog-wrap custom-wrapper"
118-
tabindex="-1"
119100
>
120101
<div
121102
aria-labelledby="test-id"
122103
aria-modal="true"
123104
class="rc-dialog"
124105
role="dialog"
125106
style="width: 600px; height: 903px;"
107+
tabindex="-1"
126108
>
127109
<div
128-
style="outline: none;"
129-
tabindex="0"
110+
class="rc-dialog-container custom-container"
130111
>
131-
<div
132-
class="rc-dialog-container custom-container"
112+
<button
113+
aria-label="Close"
114+
class="rc-dialog-close"
115+
type="button"
133116
>
134-
<button
135-
aria-label="Close"
136-
class="rc-dialog-close"
137-
type="button"
138-
>
139-
<span
140-
class="rc-dialog-close-x"
141-
/>
142-
</button>
143-
<div
144-
class="rc-dialog-header custom-header"
145-
>
146-
<div
147-
class="rc-dialog-title"
148-
id="test-id"
149-
>
150-
Default
151-
</div>
152-
</div>
153-
<div
154-
class="rc-dialog-body custom-body"
117+
<span
118+
class="rc-dialog-close-x"
155119
/>
120+
</button>
121+
<div
122+
class="rc-dialog-header custom-header"
123+
>
156124
<div
157-
class="rc-dialog-footer custom-footer"
125+
class="rc-dialog-title"
126+
id="test-id"
158127
>
159-
Footer
128+
Default
160129
</div>
161130
</div>
131+
<div
132+
class="rc-dialog-body custom-body"
133+
/>
134+
<div
135+
class="rc-dialog-footer custom-footer"
136+
>
137+
Footer
138+
</div>
162139
</div>
163-
<div
164-
style="width: 0px; height: 0px; overflow: hidden; outline: none;"
165-
tabindex="0"
166-
/>
167140
</div>
168141
</div>
169142
</div>
@@ -180,60 +153,51 @@ exports[`dialog should support styles 1`] = `
180153
<div
181154
class="rc-dialog-wrap"
182155
style="background: pink;"
183-
tabindex="-1"
184156
>
185157
<div
186158
aria-labelledby="test-id"
187159
aria-modal="true"
188160
class="rc-dialog"
189161
role="dialog"
190162
style="width: 600px; height: 903px;"
163+
tabindex="-1"
191164
>
192165
<div
193-
style="outline: none;"
194-
tabindex="0"
166+
class="rc-dialog-container"
167+
style="background: orange;"
195168
>
196-
<div
197-
class="rc-dialog-container"
198-
style="background: orange;"
169+
<button
170+
aria-label="Close"
171+
class="rc-dialog-close"
172+
type="button"
199173
>
200-
<button
201-
aria-label="Close"
202-
class="rc-dialog-close"
203-
type="button"
204-
>
205-
<span
206-
class="rc-dialog-close-x"
207-
/>
208-
</button>
209-
<div
210-
class="rc-dialog-header"
211-
style="background: red;"
212-
>
213-
<div
214-
class="rc-dialog-title"
215-
id="test-id"
216-
style="background: orange;"
217-
>
218-
Default
219-
</div>
220-
</div>
221-
<div
222-
class="rc-dialog-body"
223-
style="background: green;"
174+
<span
175+
class="rc-dialog-close-x"
224176
/>
177+
</button>
178+
<div
179+
class="rc-dialog-header"
180+
style="background: red;"
181+
>
225182
<div
226-
class="rc-dialog-footer"
227-
style="background: blue;"
183+
class="rc-dialog-title"
184+
id="test-id"
185+
style="background: orange;"
228186
>
229-
Footer
187+
Default
230188
</div>
231189
</div>
190+
<div
191+
class="rc-dialog-body"
192+
style="background: green;"
193+
/>
194+
<div
195+
class="rc-dialog-footer"
196+
style="background: blue;"
197+
>
198+
Footer
199+
</div>
232200
</div>
233-
<div
234-
style="width: 0px; height: 0px; overflow: hidden; outline: none;"
235-
tabindex="0"
236-
/>
237201
</div>
238202
</div>
239203
</div>

‎tests/index.spec.tsx‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -239,35 +239,6 @@ describe('dialog', () => {
239239
expect(document.querySelector('input')).toHaveFocus();
240240
});
241241

242-
describe('Tab should keep focus in dialog', () => {
243-
it('basic tabbing', () => {
244-
render(<Dialog visible />);
245-
const sentinelEnd = document.querySelector<HTMLDivElement>('.rc-dialog > div:last-child');
246-
sentinelEnd.focus();
247-
248-
fireEvent.keyDown(document.querySelector('.rc-dialog-wrap'), {
249-
keyCode: KeyCode.TAB,
250-
});
251-
252-
const sentinelStart = document.querySelector('.rc-dialog > div:first-child');
253-
expect(document.activeElement).toBe(sentinelStart);
254-
});
255-
256-
it('trap focus after shift-tabbing', () => {
257-
render(<Dialog visible />);
258-
259-
document.querySelector<HTMLDivElement>('.rc-dialog > div:first-child').focus();
260-
261-
fireEvent.keyDown(document.querySelector('.rc-dialog-wrap'), {
262-
keyCode: KeyCode.TAB,
263-
key: 'Tab',
264-
shiftKey: true,
265-
});
266-
const sentinelEnd = document.querySelector('.rc-dialog > div:last-child');
267-
expect(document.activeElement).toBe(sentinelEnd);
268-
});
269-
});
270-
271242
describe('mousePosition', () => {
272243
function prepareModal(mousePosition: { x: number; y: number }) {
273244
const { container } = render(

0 commit comments

Comments
 (0)