Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Convert a few async_test(async...) into promise_tests #25043

Merged
merged 5 commits into from
Sep 14, 2020
Merged

Convert a few async_test(async...) into promise_tests #25043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d4d503c
Convert some async_test(async...) into promise_tests
stephenmcgruer Aug 17, 2020
06f5055
Use t.step_func to correctly capture failing asserts
stephenmcgruer Aug 23, 2020
3274852
Catch rejected promises in reporting-navigation.https.html
stephenmcgruer Sep 2, 2020
ae5271d
Address comment in reporting-to-endpoint.https.html
stephenmcgruer Sep 2, 2020
b1f99d4
Address comments
stephenmcgruer Sep 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 30 additions & 32 deletions html/cross-origin-embedder-policy/reporting-navigation.https.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,40 +110,38 @@
function desc(s) {
return s === '' ? '(none)' : s;
}
async_test(async (t) => {
try {
const targetUrl = REMOTE_FRAME_URL + testcase.target;
const parent =
await loadFrames(t, testcase.parent, withEmptyFrame, targetUrl);

// These tests are very slow, so they must be run in parallel using
stephenmcgruer marked this conversation as resolved.
Show resolved Hide resolved
// async_test.
async_test(t => {
const targetUrl = REMOTE_FRAME_URL + testcase.target;
loadFrames(t, testcase.parent, withEmptyFrame, targetUrl)
.then(t.step_func(parent => {
const contextUrl = parent.src ? parent.src : 'about:blank';
const reports = await observeReports(parent.contentWindow);
assert_equals(reports.length, testcase.reports.length);

for (let i = 0; i < reports.length; i += 1) {
const report = reports[i];
switch (testcase.reports[i]) {
case 'CORP':
checkCorpReport(report, contextUrl, targetUrl, 'enforce');
break;
case 'CORP-RO':
checkCorpReport(report, contextUrl, targetUrl, 'reporting');
break;
case 'NAV':
checkCoepMismatchReport(report, contextUrl, targetUrl, 'enforce');
break;
case 'NAV-RO':
checkCoepMismatchReport(report, contextUrl, targetUrl, 'reporting');
break;
default:
assert_unreached(
'Unexpected report expeaction: ' + testcase.reports[i]);
observeReports(parent.contentWindow).then(t.step_func(reports => {
assert_equals(reports.length, testcase.reports.length);
for (let i = 0; i < reports.length; i += 1) {
const report = reports[i];
switch (testcase.reports[i]) {
case 'CORP':
checkCorpReport(report, contextUrl, targetUrl, 'enforce');
break;
case 'CORP-RO':
checkCorpReport(report, contextUrl, targetUrl, 'reporting');
break;
case 'NAV':
checkCoepMismatchReport(report, contextUrl, targetUrl, 'enforce');
break;
case 'NAV-RO':
checkCoepMismatchReport(report, contextUrl, targetUrl, 'reporting');
break;
default:
assert_unreached(
'Unexpected report expeaction: ' + testcase.reports[i]);
}
}
}
t.done();
} catch (e) {
t.step(() => { throw e; });
}
t.done();
})).catch(t.step_func(e => { throw e; }));
})).catch(t.step_func(e => { throw e; }));
}, `parent: ${desc(testcase.parent)}, target: ${desc(testcase.target)}, ` +
`with empty frame: ${withEmptyFrame}`);
}
Expand Down
138 changes: 60 additions & 78 deletions html/cross-origin-embedder-policy/reporting-to-endpoint.https.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,100 +77,82 @@
assert_unreached(`A report whose blockedURL is ${blockedUrl} and url is ${contextUrl} is not found.`);
}

async_test(async (t) => {
try {
const iframe = document.createElement('iframe');
t.add_cleanup(() => iframe.remove());

iframe.src = `resources/reporting-empty-frame.html`
document.body.appendChild(iframe);
await new Promise(resolve => {
iframe.addEventListener('load', resolve, {once: true});
});

const url = `${REMOTE_ORIGIN}/common/text-plain.txt?${token()}`;
const init = { mode: 'no-cors', cache: 'no-store' };
// The response comes from cross-origin, and doesn't have a CORP
// header, so it is blocked.
iframe.contentWindow.fetch(url, init).catch(() => {});

// Wait 3 seconds for reports to settle.
await wait(3000);

checkCorpReportExistence(reports, url, iframe.src, '', 'enforce');
checkCorpReportExistence(
promise_test(async t => {
foolip marked this conversation as resolved.
Show resolved Hide resolved
const iframe = document.createElement('iframe');
t.add_cleanup(() => iframe.remove());

iframe.src = `resources/reporting-empty-frame.html`
document.body.appendChild(iframe);
await new Promise(resolve => {
iframe.addEventListener('load', resolve, {once: true});
});

const url = `${REMOTE_ORIGIN}/common/text-plain.txt?${token()}`;
const init = { mode: 'no-cors', cache: 'no-store' };
// The response comes from cross-origin, and doesn't have a CORP
// header, so it is blocked.
iframe.contentWindow.fetch(url, init).catch(() => {});

// Wait 3 seconds for reports to settle.
await wait(3000);

checkCorpReportExistence(reports, url, iframe.src, '', 'enforce');
checkCorpReportExistence(
reportsForReportOnly, url, iframe.src, '', 'reporting');

t.done();
} catch (e) {
t.step(() => { throw e });
}
}, 'subresource CORP');

async_test(async (t) => {
try {
const iframe = document.createElement('iframe');
t.add_cleanup(() => iframe.remove());
promise_test(async t => {
const iframe = document.createElement('iframe');
t.add_cleanup(() => iframe.remove());

iframe.src = `resources/reporting-empty-frame.html`
document.body.appendChild(iframe);
await new Promise(resolve => {
iframe.addEventListener('load', resolve, {once: true});
});
iframe.src = `resources/reporting-empty-frame.html`
document.body.appendChild(iframe);
await new Promise(resolve => {
iframe.addEventListener('load', resolve, {once: true});
});

const w = iframe.contentWindow;
const w = iframe.contentWindow;

function attachFrame(url) {
const frame = w.document.createElement('iframe');
frame.src = url;
w.document.body.appendChild(frame);
}
function attachFrame(url) {
const frame = w.document.createElement('iframe');
frame.src = url;
w.document.body.appendChild(frame);
}

const url = `${REMOTE_ORIGIN}/common/blank.html?${token()}`;
// The nested frame comes from cross-origin and doesn't have a CORP
// header, so it is blocked.
attachFrame(url);
const url = `${REMOTE_ORIGIN}/common/blank.html?${token()}`;
// The nested frame comes from cross-origin and doesn't have a CORP
// header, so it is blocked.
attachFrame(url);

// Wait 3 seconds for reports to settle.
await wait(3000);
// Wait 3 seconds for reports to settle.
await wait(3000);

checkCorpReportExistence(reports, url, iframe.src, 'iframe', 'enforce');
checkCorpReportExistence(
checkCorpReportExistence(reports, url, iframe.src, 'iframe', 'enforce');
checkCorpReportExistence(
reportsForReportOnly, url, iframe.src, 'iframe', 'reporting');

t.done();
} catch (e) {
t.step(() => { throw e });
}
}, 'navigation CORP');

async_test(async (t) => {
try {
const iframe = document.createElement('iframe');
t.add_cleanup(() => iframe.remove());
promise_test(async (t) => {
const iframe = document.createElement('iframe');
t.add_cleanup(() => iframe.remove());

iframe.src = 'resources/reporting-empty-frame.html';
const targetUrl = `/common/blank.html?${token()}`;
iframe.addEventListener('load', () => {
const nested = iframe.contentDocument.createElement('iframe');
nested.src = targetUrl;
// |nested| doesn't have COEP whereas |iframe| has, so it is blocked.
iframe.contentDocument.body.appendChild(nested);
}, {once: true});
iframe.src = 'resources/reporting-empty-frame.html';
const targetUrl = `/common/blank.html?${token()}`;
iframe.addEventListener('load', t.step_func(() => {
const nested = iframe.contentDocument.createElement('iframe');
stephenmcgruer marked this conversation as resolved.
Show resolved Hide resolved
nested.src = targetUrl;
// |nested| doesn't have COEP whereas |iframe| has, so it is blocked.
iframe.contentDocument.body.appendChild(nested);
}), {once: true});

document.body.appendChild(iframe);
document.body.appendChild(iframe);

// Wait 3 seconds for reports to settle.
await wait(3000);
// Wait 3 seconds for reports to settle.
await wait(3000);

checkNavigationReportExistence(reports, targetUrl, iframe.src, 'enforce');
checkNavigationReportExistence(
reportsForReportOnly, targetUrl, iframe.src, 'reporting');

t.done();
} catch (e) {
t.step(() => { throw e });
}
checkNavigationReportExistence(reports, targetUrl, iframe.src, 'enforce');
checkNavigationReportExistence(
reportsForReportOnly, targetUrl, iframe.src, 'reporting');
}, 'COEP violation on nested frame navigation');

</script>$
8 changes: 5 additions & 3 deletions screen-wake-lock/wakelock-onrelease.https.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,19 @@
<script src="/resources/testdriver.js"></script>
<script src="/resources/testdriver-vendor.js"></script>
<script>
async_test(async t => {
promise_test(async t => {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excellent, wakelock-onrelease.https.html fails fast with a clear error message in Firefox and Safari now!

await test_driver.set_permission({name: 'screen-wake-lock'}, 'granted', false);

const lock = await navigator.wakeLock.request("screen");
lock.onrelease = t.step_func_done((ev) => {
return new Promise(resolve => {
lock.onrelease = resolve;
lock.release();
}).then(ev => {
assert_class_string(ev, "Event", "release() must fire an Event object");
assert_equals(ev.target, lock, "The event's target must be the lock that was acquired");
assert_true(ev.isTrusted);
assert_false(ev.bubbles);
assert_false(ev.cancelable);
});
await lock.release();
}, "Test onreleased event's basic properties");
</script>