|
26 | 26 | return type; |
27 | 27 | } |
28 | 28 |
|
| 29 | + function assertHeaders(headers, expectedTag, preloadingType) { |
| 30 | + if (expectedTag === undefined) { |
| 31 | + // If `tag` is invalid, preloading should not be |
| 32 | + // triggered, and the navigation should fall back to network. Confirm |
| 33 | + // this behavior by checking the request headers. |
| 34 | + assert_false(headers.has("sec-purpose")); |
| 35 | + assert_false(headers.has("sec-speculation-tags")); |
| 36 | + } else { |
| 37 | + // Make sure the page is preloaded. |
| 38 | + assert_equals( |
| 39 | + headers.get("sec-purpose"), |
| 40 | + preloadingType === "prefetch" ? "prefetch" : "prefetch;prerender"); |
| 41 | + assert_equals(headers.get("sec-speculation-tags"), expectedTag); |
| 42 | + } |
| 43 | + } |
| 44 | + |
29 | 45 | function testRulesetTag(tag, expectedTag, description) { |
30 | 46 | promise_test(async t => { |
31 | 47 | const rcHelper = new RemoteContextHelper(); |
|
35 | 51 | const preloadingType = getPreloadingType(); |
36 | 52 | const preloadedRC = await referrerRC.helper.createContext({ |
37 | 53 | executorCreator(url) { |
38 | | - return referrerRC.executeScript((preloadingType, tag, url) => { |
| 54 | + return referrerRC.executeScript((preloadingType, tag, url, expectedTag) => { |
39 | 55 | const script = document.createElement("script"); |
40 | 56 | script.type = "speculationrules"; |
41 | 57 | script.textContent = JSON.stringify({ |
|
47 | 63 | } |
48 | 64 | ] |
49 | 65 | }); |
| 66 | + |
| 67 | + if (expectedTag === undefined) { |
| 68 | + return new Promise(resolve => { |
| 69 | + script.addEventListener('error', resolve, { once: true }); |
| 70 | + document.head.append(script); |
| 71 | + }); |
| 72 | + } |
| 73 | + |
50 | 74 | document.head.append(script); |
51 | | - }, [preloadingType, tag, url]); |
| 75 | + }, [preloadingType, tag, url, expectedTag]); |
52 | 76 | }, extraConfig |
53 | 77 | }); |
54 | 78 |
|
55 | 79 | // Navigate to the preloaded page. |
56 | 80 | referrerRC.navigateTo(preloadedRC.url); |
57 | 81 |
|
58 | 82 | const headers = await preloadedRC.getRequestHeaders(); |
59 | | - // Make sure the page is preloaded. |
60 | | - assert_equals( |
61 | | - headers.get("sec-purpose"), |
62 | | - preloadingType === "prefetch" ? "prefetch" : "prefetch;prerender"); |
63 | | - assert_equals(headers.get("sec-speculation-tags"), expectedTag); |
| 83 | + assertHeaders(headers, expectedTag, preloadingType); |
64 | 84 | }, "Sec-Speculation-Tags [ruleset-based]: " + description); |
65 | 85 | } |
66 | 86 |
|
|
94 | 114 | referrerRC.navigateTo(preloadedRC.url); |
95 | 115 |
|
96 | 116 | const headers = await preloadedRC.getRequestHeaders(); |
97 | | - |
98 | | - if (expectedTag === undefined) { |
99 | | - // If `tag` on the rule level is invalid, preloading should not be |
100 | | - // triggered, and the navigation should fall back to network. Confirm |
101 | | - // this behavior by checking the request headers. |
102 | | - assert_false(headers.has("sec-purpose")); |
103 | | - assert_false(headers.has("sec-speculation-tags")); |
104 | | - } else { |
105 | | - // Make sure the page is preloaded. |
106 | | - assert_equals( |
107 | | - headers.get("sec-purpose"), |
108 | | - preloadingType === "prefetch" ? "prefetch" : "prefetch;prerender"); |
109 | | - assert_equals(headers.get("sec-speculation-tags"), expectedTag); |
110 | | - } |
111 | | - |
| 117 | + assertHeaders(headers, expectedTag, preloadingType); |
112 | 118 | }, "Sec-Speculation-Tags [rule-based]: " + description); |
113 | 119 | } |
114 | 120 |
|
|
124 | 130 | // Runs the test function for invalid tag cases based on the tag level. |
125 | 131 | globalThis.testInvalidTag = (tag, description) => { |
126 | 132 | if (getTagLevel() === 'ruleset') { |
127 | | - testRulesetTag(tag, 'null', description); |
| 133 | + testRulesetTag(tag, undefined, description); |
128 | 134 | } else { |
129 | 135 | // Pass `undefined` to indicate this preloading is expected to fail. |
130 | 136 | testRuleTag(tag, undefined, description); |
|
0 commit comments