From 606c0b7b8050928f61b963c72a25645b331dfb10 Mon Sep 17 00:00:00 2001
From: Daniel Richards <daniel.richards@automattic.com>
Date: Fri, 8 May 2020 16:16:15 +0800
Subject: [PATCH] Try to fix tests

---
 .../src/components/button-block-appender/index.js         | 6 ++++--
 packages/e2e-tests/config/setup-test-framework.js         | 5 +++--
 .../editor/various/block-hierarchy-navigation.test.js     | 8 ++++----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/packages/block-editor/src/components/button-block-appender/index.js b/packages/block-editor/src/components/button-block-appender/index.js
index 32c2b21223cda..6bdeb479dd163 100644
--- a/packages/block-editor/src/components/button-block-appender/index.js
+++ b/packages/block-editor/src/components/button-block-appender/index.js
@@ -21,7 +21,8 @@ function ButtonBlockAppender(
 		rootClientId,
 		className,
 		__experimentalSelectBlockOnInsert: selectBlockOnInsert,
-		...props
+		onFocus,
+		tabIndex,
 	},
 	ref
 ) {
@@ -55,6 +56,8 @@ function ButtonBlockAppender(
 					<Tooltip text={ label }>
 						<Button
 							ref={ ref }
+							onFocus={ onFocus }
+							tabIndex={ tabIndex }
 							className={ classnames(
 								className,
 								'block-editor-button-block-appender'
@@ -68,7 +71,6 @@ function ButtonBlockAppender(
 							}
 							disabled={ disabled }
 							label={ label }
-							{ ...props }
 						>
 							<VisuallyHidden as="span">{ label }</VisuallyHidden>
 							<Icon icon={ create } />
diff --git a/packages/e2e-tests/config/setup-test-framework.js b/packages/e2e-tests/config/setup-test-framework.js
index d4f9394d22f10..98cc0a5f2657f 100644
--- a/packages/e2e-tests/config/setup-test-framework.js
+++ b/packages/e2e-tests/config/setup-test-framework.js
@@ -226,6 +226,7 @@ async function runAxeTestsForBlockEditor() {
 		// See: https://github.com/WordPress/gutenberg/pull/15018.
 		disabledRules: [
 			'aria-allowed-role',
+			'aria-allowed-attr',
 			'aria-hidden-focus',
 			'aria-input-field-name',
 			'aria-valid-attr-value',
@@ -247,8 +248,8 @@ async function runAxeTestsForBlockEditor() {
 			// These properties were not included in the 1.1 spec
 			// through error, they should be allowed on role="row":
 			// https://github.com/w3c/aria/issues/558
-			'[role="row"][aria-setsize]',
-			'[role="row"][aria-posinset]',
+			'[role="treegrid"] [aria-posinset]',
+			'[role="treegrid"] [aria-setsize]',
 		],
 	} );
 }
diff --git a/packages/e2e-tests/specs/editor/various/block-hierarchy-navigation.test.js b/packages/e2e-tests/specs/editor/various/block-hierarchy-navigation.test.js
index e3222c67d0614..8f1251d2a84ff 100644
--- a/packages/e2e-tests/specs/editor/various/block-hierarchy-navigation.test.js
+++ b/packages/e2e-tests/specs/editor/various/block-hierarchy-navigation.test.js
@@ -13,7 +13,7 @@ import {
 async function openBlockNavigator() {
 	await pressKeyWithModifier( 'access', 'o' );
 	await page.waitForSelector(
-		'.block-editor-block-navigation-item__block.is-selected'
+		'.block-editor-block-navigation-row.is-selected'
 	);
 }
 
@@ -38,7 +38,7 @@ describe( 'Navigating the block hierarchy', () => {
 		await page.click( '[aria-label="Block navigation"]' );
 		const columnsBlockMenuItem = (
 			await page.$x(
-				"//button[contains(@class,'block-editor-block-navigation-item__button') and contains(text(), 'Columns')]"
+				"//button[contains(@class,'block-editor-block-navigation-row__select-button') and contains(text(), 'Columns')]"
 			)
 		 )[ 0 ];
 		await columnsBlockMenuItem.click();
@@ -57,7 +57,7 @@ describe( 'Navigating the block hierarchy', () => {
 		await page.click( '[aria-label="Block navigation"]' );
 		const lastColumnsBlockMenuItem = (
 			await page.$x(
-				"//button[contains(@class,'block-editor-block-navigation-item__button') and contains(text(), 'Column')]"
+				"//button[contains(@class,'block-editor-block-navigation-row__select-button') and contains(text(), 'Column')]"
 			)
 		 )[ 3 ];
 		await lastColumnsBlockMenuItem.click();
@@ -163,7 +163,7 @@ describe( 'Navigating the block hierarchy', () => {
 		await page.click( '[aria-label="Block navigation"]' );
 		const groupMenuItem = (
 			await page.$x(
-				"//button[contains(@class,'block-editor-block-navigation__item') and contains(text(), 'Group')]"
+				"//button[contains(@class,'block-editor-block-navigation-row__select-button') and contains(text(), 'Group')]"
 			)
 		 )[ 0 ];
 		await groupMenuItem.click();