diff --git a/web-nfc/NDEFReader-document-hidden-manual.https.html b/web-nfc/NDEFReader-read-document-hidden-manual.https.html similarity index 80% rename from web-nfc/NDEFReader-document-hidden-manual.https.html rename to web-nfc/NDEFReader-read-document-hidden-manual.https.html index ffbd7ebc45618a9..47c1332713eef20 100644 --- a/web-nfc/NDEFReader-document-hidden-manual.https.html +++ b/web-nfc/NDEFReader-read-document-hidden-manual.https.html @@ -9,15 +9,15 @@ @@ -9,7 +9,7 @@ diff --git a/web-nfc/NDEFReader_scan.https.html b/web-nfc/NDEFReader_scan.https.html index b551af0150f068b..76067ab865666aa 100644 --- a/web-nfc/NDEFReader_scan.https.html +++ b/web-nfc/NDEFReader_scan.https.html @@ -21,104 +21,141 @@ ]; function waitSyntaxErrorPromise(t, scan_options) { - const reader = new NDEFReader(); - return promise_rejects_dom(t, 'SyntaxError', reader.scan(scan_options)); + const ndef = new NDEFReader(); + return promise_rejects_dom(t, 'SyntaxError', ndef.scan(scan_options)); } nfc_test(async t => { - const reader = new NDEFReader(); + const ndef = new NDEFReader(); const promises = []; invalid_signals.forEach(invalid_signal => { promises.push(promise_rejects_js(t, TypeError, - reader.scan({ signal: invalid_signal }))); + ndef.scan({ signal: invalid_signal }))); }); await Promise.all(promises); }, "Test that NDEFReader.scan rejects if signal is not an AbortSignal."); nfc_test(async t => { await test_driver.set_permission({ name: 'nfc' }, 'denied', false); - const reader = new NDEFReader(); - await promise_rejects_dom(t, 'NotAllowedError', reader.scan()); + const ndef = new NDEFReader(); + await promise_rejects_dom(t, 'NotAllowedError', ndef.scan()); }, "NDEFReader.scan should fail if user permission is not granted."); // We do not provide NFC mock here to simulate that there has no available // implementation for NFC Mojo interface. nfc_test(async (t, mockNFC) => { mockNFC.simulateClosedPipe(); - const reader = new NDEFReader(); - await promise_rejects_dom(t, 'NotSupportedError', reader.scan()); -}, "NDEFReader.scan should faild if no implementation for NFC Mojo interface."); + const ndef = new NDEFReader(); + await promise_rejects_dom(t, 'NotSupportedError', ndef.scan()); +}, "NDEFReader.scan should fail if no implementation for NFC Mojo interface."); nfc_test(async (t, mockNFC) => { mockNFC.setHWStatus(NFCHWStatus.DISABLED); - const reader = new NDEFReader(); - await promise_rejects_dom(t, 'NotReadableError', reader.scan()); + const ndef = new NDEFReader(); + await promise_rejects_dom(t, 'NotReadableError', ndef.scan()); }, "NDEFReader.scan should fail if NFC HW is disabled."); nfc_test(async (t, mockNFC) => { mockNFC.setHWStatus(NFCHWStatus.NOT_SUPPORTED); - const reader = new NDEFReader(); - await promise_rejects_dom(t, 'NotSupportedError', reader.scan()); + const ndef = new NDEFReader(); + await promise_rejects_dom(t, 'NotSupportedError', ndef.scan()); }, "NDEFReader.scan should fail if NFC HW is not supported."); +nfc_test(async () => { + await new Promise((resolve,reject) => { + const iframe = document.createElement('iframe'); + iframe.srcdoc = ` diff --git a/web-nfc/NDEFReader_scan_iframe.https.html b/web-nfc/NDEFReader_scan_iframe.https.html index 8803c25fb0a54fe..6967c76ecd6d6bf 100644 --- a/web-nfc/NDEFReader_scan_iframe.https.html +++ b/web-nfc/NDEFReader_scan_iframe.https.html @@ -1,6 +1,6 @@ -