|
62 | 62 | promise_test(async (t) => {
|
63 | 63 | await setup(t,closedby);
|
64 | 64 | openDialog(modal);
|
65 |
| - if (dialog.closedBy != "none") { |
66 |
| - dialog.requestClose(); |
67 |
| - assert_false(dialog.open); |
68 |
| - } else { |
69 |
| - assert_throws_dom('InvalidStateError',() => dialog.requestClose()); |
70 |
| - assert_true(dialog.open); |
71 |
| - } |
| 65 | + dialog.requestClose(); |
| 66 | + assert_false(dialog.open); |
72 | 67 | },`requestClose basic behavior ${testDescription}`);
|
73 | 68 |
|
74 | 69 | promise_test(async (t) => {
|
|
78 | 73 | dialog.addEventListener('close',() => events.push('close'),{signal});
|
79 | 74 | openDialog(modal);
|
80 | 75 | assert_array_equals(events,[]);
|
81 |
| - if (dialog.closedBy != "none") { |
82 |
| - dialog.requestClose(); |
83 |
| - assert_false(dialog.open); |
84 |
| - assert_array_equals(events,['cancel'],'close is scheduled'); |
85 |
| - await new Promise(resolve => requestAnimationFrame(resolve)); |
86 |
| - assert_array_equals(events,['cancel','close']); |
87 |
| - } else { |
88 |
| - assert_throws_dom('InvalidStateError',() => dialog.requestClose()); |
89 |
| - } |
| 76 | + dialog.requestClose(); |
| 77 | + assert_false(dialog.open); |
| 78 | + assert_array_equals(events,['cancel'],'close is scheduled'); |
| 79 | + await new Promise(resolve => requestAnimationFrame(resolve)); |
| 80 | + assert_array_equals(events,['cancel','close']); |
90 | 81 | },`requestClose fires both cancel and close ${testDescription}`);
|
91 | 82 |
|
92 | 83 | promise_test(async (t) => {
|
|
97 | 88 | openDialog(modal);
|
98 | 89 | dialog.setAttribute('closedby',closedby);
|
99 | 90 | assert_array_equals(events,[]);
|
100 |
| - if (dialog.closedBy != "none") { |
101 |
| - dialog.requestClose(); |
102 |
| - assert_false(dialog.open); |
103 |
| - } else { |
104 |
| - assert_throws_dom('InvalidStateError',() => dialog.requestClose()); |
105 |
| - } |
| 91 | + dialog.requestClose(); |
| 92 | + assert_false(dialog.open); |
106 | 93 | },`changing closedby from 'none' to '${closedby}' for ${modal ? "modal" : "modeless"} dialog`);
|
107 | 94 |
|
108 | 95 | promise_test(async (t) => {
|
|
113 | 100 | openDialog(modal);
|
114 | 101 | dialog.removeAttribute('closedby');
|
115 | 102 | assert_array_equals(events,[]);
|
116 |
| - if (dialog.closedBy != "none") { |
117 |
| - dialog.requestClose(); |
118 |
| - assert_false(dialog.open); |
119 |
| - } else { |
120 |
| - assert_throws_dom('InvalidStateError',() => dialog.requestClose()); |
121 |
| - } |
| 103 | + dialog.requestClose(); |
| 104 | + assert_false(dialog.open); |
122 | 105 | },`Removing closedby when closedby='${closedby}' for ${modal ? "modal" : "modeless"} dialog`);
|
123 | 106 |
|
124 | 107 | if (dialog.closedBy != "none") {
|
|
0 commit comments