From 2a62de759b7787ad977b60dfc5a71cef274a2be1 Mon Sep 17 00:00:00 2001 From: Austin Sullivan Date: Fri, 2 Apr 2021 22:01:39 +0000 Subject: [PATCH] Bug 1702343 [wpt PR 28322] - FSA: Make startIn field non-nullable, a=testonly Automatic update from web-platform-tests FSA: Make startIn field non-nullable Change this to match the spec. There was not much reason to have this nullable in the first place, since the startIn field is optional. Bug: 1194652 Change-Id: I7e77945aceb11b554fc7952f22c8b4bde044880d Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2797570 Commit-Queue: Austin Sullivan Commit-Queue: Marijn Kruisselbrink Reviewed-by: Marijn Kruisselbrink Auto-Submit: Austin Sullivan Cr-Commit-Position: refs/heads/master@{#868307} -- wpt-commits: 1df8336646defce76dfacaff690d4ae2cff92727 wpt-pr: 28322 --- .../showOpenFilePicker-manual.https.html | 20 ------------------- .../showPicker-errors.https.window.js | 6 ++++++ 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/testing/web-platform/tests/file-system-access/showOpenFilePicker-manual.https.html b/testing/web-platform/tests/file-system-access/showOpenFilePicker-manual.https.html index fd72b040c0c9..2c8f29d7b657 100644 --- a/testing/web-platform/tests/file-system-access/showOpenFilePicker-manual.https.html +++ b/testing/web-platform/tests/file-system-access/showOpenFilePicker-manual.https.html @@ -38,25 +38,5 @@ }, 'showOpenFilePicker returns correct permissions'); }, 'showOpenFilePicker works'); - promise_test(async t => { - await window.test_driver.bless( - 'show a file picker.
Please select file-system-access/resources/data/testfile.txt'); - const files = await self.showOpenFilePicker({ - multiple: false, - startIn: null, - types: [ - { description: 'Text files', accept: { ' text/plain ': ['.txt'] } }, - { description: 'Images', accept: { ' image/* ': ['.jpg', '.jpeg', '.png'] } }, - ], - }); - assert_true(Array.isArray(files)); - assert_equals(files.length, 1); - assert_true(files[0] instanceof FileSystemHandle); - assert_true(files[0] instanceof FileSystemFileHandle); - assert_equals(files[0].kind, "file"); - assert_equals(files[0].name, 'testfile.txt'); - assert_equals(await (await files[0].getFile()).text(), 'Hello World!\n'); - }, 'showOpenFilePicker does not fail when starting directory is null'); - diff --git a/testing/web-platform/tests/file-system-access/showPicker-errors.https.window.js b/testing/web-platform/tests/file-system-access/showPicker-errors.https.window.js index 189f47344cab..ed66e1093b1c 100644 --- a/testing/web-platform/tests/file-system-access/showPicker-errors.https.window.js +++ b/testing/web-platform/tests/file-system-access/showPicker-errors.https.window.js @@ -86,6 +86,12 @@ function define_file_picker_error_tests(showPickerMethod) { })); }, showPickerMethod + ': unknown well-known starting directory.'); + promise_test(async t => { + await promise_rejects_js(t, TypeError, self[showPickerMethod]({ + startIn: null, + })); + }, showPickerMethod + ': starting directory can\t be null.'); + promise_test(async t => { await promise_rejects_js(t, TypeError, self[showPickerMethod]({ id: "inv*l:d\\ chara