Skip to content

Commit 574e4f4

Browse files
timvandermeijtimvandermeij
authored
Merge pull request #19809 from timvandermeij/integration-tests-isolate-all-and-random
Run the integration tests in a random order
2 parents c071f44 + 938430b commit 574e4f4

15 files changed

Lines changed: 286 additions & 374 deletions

‎test/integration/accessibility_spec.mjs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ describe("accessibility", () => {
3838
describe("structure tree", () => {
3939
let pages;
4040

41-
beforeAll(async () => {
41+
beforeEach(async () => {
4242
pages = await loadAndWait("structure_simple.pdf", ".structTree");
4343
});
4444

45-
afterAll(async () => {
45+
afterEach(async () => {
4646
await closePages(pages);
4747
});
4848

@@ -107,14 +107,14 @@ describe("accessibility", () => {
107107
describe("Annotation", () => {
108108
let pages;
109109

110-
beforeAll(async () => {
110+
beforeEach(async () => {
111111
pages = await loadAndWait(
112112
"tracemonkey_a11y.pdf",
113113
".textLayer .endOfContent"
114114
);
115115
});
116116

117-
afterAll(async () => {
117+
afterEach(async () => {
118118
await closePages(pages);
119119
});
120120

@@ -147,11 +147,11 @@ describe("accessibility", () => {
147147
describe("Annotations order", () => {
148148
let pages;
149149

150-
beforeAll(async () => {
150+
beforeEach(async () => {
151151
pages = await loadAndWait("fields_order.pdf", ".annotationLayer");
152152
});
153153

154-
afterAll(async () => {
154+
afterEach(async () => {
155155
await closePages(pages);
156156
});
157157

@@ -180,11 +180,11 @@ describe("accessibility", () => {
180180
describe("Stamp annotation accessibility", () => {
181181
let pages;
182182

183-
beforeAll(async () => {
183+
beforeEach(async () => {
184184
pages = await loadAndWait("tagged_stamp.pdf", ".annotationLayer");
185185
});
186186

187-
afterAll(async () => {
187+
afterEach(async () => {
188188
await closePages(pages);
189189
});
190190

@@ -245,11 +245,11 @@ describe("accessibility", () => {
245245
describe("Figure in the content stream", () => {
246246
let pages;
247247

248-
beforeAll(async () => {
248+
beforeEach(async () => {
249249
pages = await loadAndWait("bug1708040.pdf", ".textLayer");
250250
});
251251

252-
afterAll(async () => {
252+
afterEach(async () => {
253253
await closePages(pages);
254254
});
255255

‎test/integration/annotation_spec.mjs‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ describe("Annotation highlight", () => {
2525
describe("annotation-highlight.pdf", () => {
2626
let pages;
2727

28-
beforeAll(async () => {
28+
beforeEach(async () => {
2929
pages = await loadAndWait(
3030
"annotation-highlight.pdf",
3131
"[data-annotation-id='19R']"
3232
);
3333
});
3434

35-
afterAll(async () => {
35+
afterEach(async () => {
3636
await closePages(pages);
3737
});
3838

@@ -62,11 +62,11 @@ describe("Annotation highlight", () => {
6262
describe("Check that widget annotations are in front of highlight ones", () => {
6363
let pages;
6464

65-
beforeAll(async () => {
65+
beforeEach(async () => {
6666
pages = await loadAndWait("bug1883609.pdf", "[data-annotation-id='23R']");
6767
});
6868

69-
afterAll(async () => {
69+
afterEach(async () => {
7070
await closePages(pages);
7171
});
7272

@@ -87,11 +87,11 @@ describe("Checkbox annotation", () => {
8787
describe("issue12706.pdf", () => {
8888
let pages;
8989

90-
beforeAll(async () => {
90+
beforeEach(async () => {
9191
pages = await loadAndWait("issue12706.pdf", "[data-annotation-id='63R']");
9292
});
9393

94-
afterAll(async () => {
94+
afterEach(async () => {
9595
await closePages(pages);
9696
});
9797

@@ -123,11 +123,11 @@ describe("Checkbox annotation", () => {
123123
describe("issue15597.pdf", () => {
124124
let pages;
125125

126-
beforeAll(async () => {
126+
beforeEach(async () => {
127127
pages = await loadAndWait("issue15597.pdf", "[data-annotation-id='7R']");
128128
});
129129

130-
afterAll(async () => {
130+
afterEach(async () => {
131131
await closePages(pages);
132132
});
133133

@@ -148,11 +148,11 @@ describe("Checkbox annotation", () => {
148148
describe("bug1847733.pdf", () => {
149149
let pages;
150150

151-
beforeAll(async () => {
151+
beforeEach(async () => {
152152
pages = await loadAndWait("bug1847733.pdf", "[data-annotation-id='18R']");
153153
});
154154

155-
afterAll(async () => {
155+
afterEach(async () => {
156156
await closePages(pages);
157157
});
158158

@@ -178,11 +178,11 @@ describe("Text widget", () => {
178178
describe("issue13271.pdf", () => {
179179
let pages;
180180

181-
beforeAll(async () => {
181+
beforeEach(async () => {
182182
pages = await loadAndWait("issue13271.pdf", "[data-annotation-id='24R']");
183183
});
184184

185-
afterAll(async () => {
185+
afterEach(async () => {
186186
await closePages(pages);
187187
});
188188

@@ -207,11 +207,11 @@ describe("Text widget", () => {
207207
describe("issue16473.pdf", () => {
208208
let pages;
209209

210-
beforeAll(async () => {
210+
beforeEach(async () => {
211211
pages = await loadAndWait("issue16473.pdf", "[data-annotation-id='22R']");
212212
});
213213

214-
afterAll(async () => {
214+
afterEach(async () => {
215215
await closePages(pages);
216216
});
217217

@@ -236,11 +236,11 @@ describe("Annotation and storage", () => {
236236
describe("issue14023.pdf", () => {
237237
let pages;
238238

239-
beforeAll(async () => {
239+
beforeEach(async () => {
240240
pages = await loadAndWait("issue14023.pdf", "[data-annotation-id='64R']");
241241
});
242242

243-
afterAll(async () => {
243+
afterEach(async () => {
244244
await closePages(pages);
245245
});
246246

@@ -337,11 +337,11 @@ describe("ResetForm action", () => {
337337
describe("resetform.pdf", () => {
338338
let pages;
339339

340-
beforeAll(async () => {
340+
beforeEach(async () => {
341341
pages = await loadAndWait("resetform.pdf", "[data-annotation-id='63R']");
342342
});
343343

344-
afterAll(async () => {
344+
afterEach(async () => {
345345
await closePages(pages);
346346
});
347347

@@ -462,14 +462,14 @@ describe("ResetForm action", () => {
462462
describe("issue14438.pdf", () => {
463463
let pages;
464464

465-
beforeAll(async () => {
465+
beforeEach(async () => {
466466
pages = await loadAndWait(
467467
"issue14438.pdf",
468468
"[data-annotation-id='10R']"
469469
);
470470
});
471471

472-
afterAll(async () => {
472+
afterEach(async () => {
473473
await closePages(pages);
474474
});
475475

@@ -490,14 +490,14 @@ describe("ResetForm action", () => {
490490
describe("annotation-caret-ink.pdf", () => {
491491
let pages;
492492

493-
beforeAll(async () => {
493+
beforeEach(async () => {
494494
pages = await loadAndWait(
495495
"annotation-caret-ink.pdf",
496496
"[data-annotation-id='25R']"
497497
);
498498
});
499499

500-
afterAll(async () => {
500+
afterEach(async () => {
501501
await closePages(pages);
502502
});
503503

@@ -525,14 +525,14 @@ describe("ResetForm action", () => {
525525
describe("bug1844583.pdf", () => {
526526
let pages;
527527

528-
beforeAll(async () => {
528+
beforeEach(async () => {
529529
pages = await loadAndWait(
530530
"bug1844583.pdf",
531531
"[data-annotation-id='8R']"
532532
);
533533
});
534534

535-
afterAll(async () => {
535+
afterEach(async () => {
536536
await closePages(pages);
537537
});
538538

@@ -553,14 +553,14 @@ describe("ResetForm action", () => {
553553
describe("tagged_stamp.pdf", () => {
554554
let pages;
555555

556-
beforeAll(async () => {
556+
beforeEach(async () => {
557557
pages = await loadAndWait(
558558
"tagged_stamp.pdf",
559559
"[data-annotation-id='20R']"
560560
);
561561
});
562562

563-
afterAll(async () => {
563+
afterEach(async () => {
564564
await closePages(pages);
565565
});
566566

@@ -622,14 +622,14 @@ describe("ResetForm action", () => {
622622
describe("issue14438.pdf", () => {
623623
let pages;
624624

625-
beforeAll(async () => {
625+
beforeEach(async () => {
626626
pages = await loadAndWait(
627627
"highlights.pdf",
628628
"[data-annotation-id='693R']"
629629
);
630630
});
631631

632-
afterAll(async () => {
632+
afterEach(async () => {
633633
await closePages(pages);
634634
});
635635

@@ -652,14 +652,14 @@ describe("ResetForm action", () => {
652652
describe("issue14438.pdf", () => {
653653
let pages;
654654

655-
beforeAll(async () => {
655+
beforeEach(async () => {
656656
pages = await loadAndWait(
657657
"rotated_ink.pdf",
658658
"[data-annotation-id='18R']"
659659
);
660660
});
661661

662-
afterAll(async () => {
662+
afterEach(async () => {
663663
await closePages(pages);
664664
});
665665

‎test/integration/autolinker_spec.mjs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ describe("autolinker", function () {
6363
describe("bug1019475_2.pdf", function () {
6464
let pages;
6565

66-
beforeAll(async () => {
66+
beforeEach(async () => {
6767
pages = await loadAndWait(
6868
"bug1019475_2.pdf",
6969
".annotationLayer",
@@ -75,7 +75,7 @@ describe("autolinker", function () {
7575
);
7676
});
7777

78-
afterAll(async () => {
78+
afterEach(async () => {
7979
await closePages(pages);
8080
});
8181

@@ -99,7 +99,7 @@ describe("autolinker", function () {
9999
describe("bug1019475_1.pdf", function () {
100100
let pages;
101101

102-
beforeAll(async () => {
102+
beforeEach(async () => {
103103
pages = await loadAndWait(
104104
"bug1019475_1.pdf",
105105
".annotationLayer",
@@ -111,7 +111,7 @@ describe("autolinker", function () {
111111
);
112112
});
113113

114-
afterAll(async () => {
114+
afterEach(async () => {
115115
await closePages(pages);
116116
});
117117

@@ -138,14 +138,14 @@ describe("autolinker", function () {
138138
describe("pr19449.pdf", function () {
139139
let pages;
140140

141-
beforeAll(async () => {
141+
beforeEach(async () => {
142142
pages = await loadAndWait("pr19449.pdf", ".annotationLayer", null, null, {
143143
docBaseUrl: "http://example.com",
144144
enableAutoLinking: true,
145145
});
146146
});
147147

148-
afterAll(async () => {
148+
afterEach(async () => {
149149
await closePages(pages);
150150
});
151151

@@ -172,7 +172,7 @@ describe("autolinker", function () {
172172
describe("PR 19470", function () {
173173
let pages;
174174

175-
beforeAll(async () => {
175+
beforeEach(async () => {
176176
pages = await loadAndWait(
177177
"bug1019475_2.pdf",
178178
".annotationLayer",
@@ -184,7 +184,7 @@ describe("autolinker", function () {
184184
);
185185
});
186186

187-
afterAll(async () => {
187+
afterEach(async () => {
188188
await closePages(pages);
189189
});
190190

@@ -218,7 +218,7 @@ describe("autolinker", function () {
218218
describe("when highlighting search results", function () {
219219
let pages;
220220

221-
beforeAll(async () => {
221+
beforeEach(async () => {
222222
pages = await loadAndWait(
223223
"issue3115r.pdf",
224224
".annotationLayer",
@@ -228,7 +228,7 @@ describe("autolinker", function () {
228228
);
229229
});
230230

231-
afterAll(async () => {
231+
afterEach(async () => {
232232
await closePages(pages);
233233
});
234234

0 commit comments

Comments
 (0)