Skip to content

Commit

Permalink
This corresponds to Chromium 80.0.3987.0.
Browse files Browse the repository at this point in the history 
This roll includes:

- Implement support for the new ARIA `generic` role
  https://chromium-review.googlesource.com/c/chromium/src/+/1872305
- Expose button's children to accessibility tree
  https://chromium-review.googlesource.com/c/chromium/src/+/1845810
  • Loading branch information
@mathiasbynens
mathiasbynens committed Jan 27, 2020
1 parent 14b2369 commit 6c6141c
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 18 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"node": ">=8.16.0"
},
"puppeteer": {
"chromium_revision": "706915"
"chromium_revision": "722269"
},
"scripts": {
"unit": "node test/test.js",
Expand Down
24 changes: 16 additions & 8 deletions test/accessibility.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ module.exports.addTests = function({testRunner, expect, FFOX}) {
expect(await page.accessibility.snapshot()).toEqual(golden);
});
it('should report uninteresting nodes', async function({page}) {
await page.setContent(`<textarea autofocus>hi</textarea>`);
await page.setContent(`<textarea>hi</textarea>`);
await page.focus('textarea');
const golden = FFOX ? {
role: 'entry',
Expand All @@ -100,7 +100,7 @@ module.exports.addTests = function({testRunner, expect, FFOX}) {
focused: true,
multiline: true,
children: [{
role: 'GenericContainer',
role: 'generic',
name: '',
children: [{
role: 'text', name: 'hi'
Expand Down Expand Up @@ -182,7 +182,7 @@ module.exports.addTests = function({testRunner, expect, FFOX}) {
name: 'my fake image'
}]
} : {
role: 'GenericContainer',
role: 'generic',
name: '',
value: 'Edit this image: ',
children: [{
Expand Down Expand Up @@ -241,7 +241,7 @@ module.exports.addTests = function({testRunner, expect, FFOX}) {
<div contenteditable="plaintext-only">Edit this image:<img src="fakeimage.png" alt="my fake image"></div>`);
const snapshot = await page.accessibility.snapshot();
expect(snapshot.children[0]).toEqual({
role: 'GenericContainer',
role: 'generic',
name: ''
});
});
Expand All @@ -250,7 +250,7 @@ module.exports.addTests = function({testRunner, expect, FFOX}) {
<div contenteditable="plaintext-only" tabIndex=0>Edit this image:<img src="fakeimage.png" alt="my fake image"></div>`);
const snapshot = await page.accessibility.snapshot();
expect(snapshot.children[0]).toEqual({
role: 'GenericContainer',
role: 'generic',
name: ''
});
});
Expand Down Expand Up @@ -360,10 +360,18 @@ module.exports.addTests = function({testRunner, expect, FFOX}) {
const div = await page.$('div');
expect(await page.accessibility.snapshot({root: div})).toEqual(null);
expect(await page.accessibility.snapshot({root: div, interestingOnly: false})).toEqual({
role: 'GenericContainer',
role: 'generic',
name: '',
children: [ { role: 'button', name: 'My Button' } ] }
);
children: [
{
role: 'button',
name: 'My Button',
children: [
{ role: 'text', name: 'My Button' },
],
},
],
});
});
});
});
Expand Down
2 changes: 1 addition & 1 deletion test/chromiumonly.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ module.exports.addLauncherTests = function({testRunner, expect, defaultBrowserOp
});

describe('Page.waitForFileChooser', () => {
it('should fail gracefully when trying to work with filechoosers within multiple connections', async() => {
xit('should fail gracefully when trying to work with filechoosers within multiple connections', async() => {
// 1. Launch a browser and connect to all pages.
const originalBrowser = await puppeteer.launch(defaultBrowserOptions);
await originalBrowser.pages();
Expand Down
16 changes: 8 additions & 8 deletions test/input.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ module.exports.addTests = function({testRunner, expect, puppeteer}) {
const {it, fit, xit, it_fails_ffox} = testRunner;
const {beforeAll, beforeEach, afterAll, afterEach} = testRunner;
describe('input', function() {
it('should upload the file', async({page, server}) => {
xit('should upload the file', async({page, server}) => {
await page.goto(server.PREFIX + '/input/fileupload.html');
const filePath = path.relative(process.cwd(), FILE_TO_UPLOAD);
const input = await page.$('input');
Expand Down Expand Up @@ -98,7 +98,7 @@ module.exports.addTests = function({testRunner, expect, puppeteer}) {
});

describe_fails_ffox('FileChooser.accept', function() {
it('should accept single file', async({page, server}) => {
xit('should accept single file', async({page, server}) => {
await page.setContent(`<input type=file oninput='javascript:console.timeStamp()'>`);
const [chooser] = await Promise.all([
page.waitForFileChooser(),
Expand All @@ -111,7 +111,7 @@ module.exports.addTests = function({testRunner, expect, puppeteer}) {
expect(await page.$eval('input', input => input.files.length)).toBe(1);
expect(await page.$eval('input', input => input.files[0].name)).toBe('file-to-upload.txt');
});
it('should be able to read selected file', async({page, server}) => {
xit('should be able to read selected file', async({page, server}) => {
await page.setContent(`<input type=file>`);
page.waitForFileChooser().then(chooser => chooser.accept([FILE_TO_UPLOAD]));
expect(await page.$eval('input', async picker => {
Expand All @@ -123,7 +123,7 @@ module.exports.addTests = function({testRunner, expect, puppeteer}) {
return promise.then(() => reader.result);
})).toBe('contents of the file');
});
it('should be able to reset selected files with empty file list', async({page, server}) => {
xit('should be able to reset selected files with empty file list', async({page, server}) => {
await page.setContent(`<input type=file>`);
page.waitForFileChooser().then(chooser => chooser.accept([FILE_TO_UPLOAD]));
expect(await page.$eval('input', async picker => {
Expand All @@ -138,7 +138,7 @@ module.exports.addTests = function({testRunner, expect, puppeteer}) {
return picker.files.length;
})).toBe(0);
});
it('should not accept multiple files for single-file input', async({page, server}) => {
xit('should not accept multiple files for single-file input', async({page, server}) => {
await page.setContent(`<input type=file>`);
const [chooser] = await Promise.all([
page.waitForFileChooser(),
Expand All @@ -151,7 +151,7 @@ module.exports.addTests = function({testRunner, expect, puppeteer}) {
]).catch(e => error = e);
expect(error).not.toBe(null);
});
it('should fail when accepting file chooser twice', async({page, server}) => {
xit('should fail when accepting file chooser twice', async({page, server}) => {
await page.setContent(`<input type=file>`);
const [fileChooser] = await Promise.all([
page.waitForFileChooser(),
Expand All @@ -165,7 +165,7 @@ module.exports.addTests = function({testRunner, expect, puppeteer}) {
});

describe_fails_ffox('FileChooser.cancel', function() {
it('should cancel dialog', async({page, server}) => {
xit('should cancel dialog', async({page, server}) => {
// Consider file chooser canceled if we can summon another one.
// There's no reliable way in WebPlatform to see that FileChooser was
// canceled.
Expand All @@ -181,7 +181,7 @@ module.exports.addTests = function({testRunner, expect, puppeteer}) {
page.$eval('input', input => input.click()),
]);
});
it('should fail when canceling file chooser twice', async({page, server}) => {
xit('should fail when canceling file chooser twice', async({page, server}) => {
await page.setContent(`<input type=file>`);
const [fileChooser] = await Promise.all([
page.waitForFileChooser(),
Expand Down

0 comments on commit 6c6141c

Please sign in to comment.