From aeb05f330ac966f8307f8b83d5608fe2ad6d379a Mon Sep 17 00:00:00 2001
From: chad1008 <13856531+chad1008@users.noreply.github.com>
Date: Thu, 10 Feb 2022 16:25:41 -0500
Subject: [PATCH 1/2] improve XPath selector to avoid reliance on DOM structure

---
 .../e2e-tests/specs/editor/various/post-visibility.test.js    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/e2e-tests/specs/editor/various/post-visibility.test.js b/packages/e2e-tests/specs/editor/various/post-visibility.test.js
index 4990bcbdbd5d7..7a54453cc2240 100644
--- a/packages/e2e-tests/specs/editor/various/post-visibility.test.js
+++ b/packages/e2e-tests/specs/editor/various/post-visibility.test.js
@@ -95,9 +95,7 @@ describe( 'Post visibility', () => {
 			'div[aria-label="Move forward to switch to the next month."]'
 		);
 		await (
-			await page.$x(
-				'//td[contains(concat(" ", @class, " "), " CalendarDay ")]/div[contains(concat(" ", @class, " "), " components-datetime__date__day ")][text() = "15"]'
-			)
+			await page.$x( '//td[@role="button"]/*[text() = "15"]' )
 		 )[ 0 ].click();
 
 		await page.click( '.edit-post-post-visibility__toggle' );

From a96b2afd8c8a516157753fe2155ce45440d044cd Mon Sep 17 00:00:00 2001
From: chad1008 <13856531+chad1008@users.noreply.github.com>
Date: Mon, 21 Feb 2022 16:05:57 -0500
Subject: [PATCH 2/2] make scheduling calendar XPath more robust

---
 .../e2e-tests/specs/editor/various/post-visibility.test.js    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/e2e-tests/specs/editor/various/post-visibility.test.js b/packages/e2e-tests/specs/editor/various/post-visibility.test.js
index 7a54453cc2240..fa93b1217f600 100644
--- a/packages/e2e-tests/specs/editor/various/post-visibility.test.js
+++ b/packages/e2e-tests/specs/editor/various/post-visibility.test.js
@@ -95,7 +95,9 @@ describe( 'Post visibility', () => {
 			'div[aria-label="Move forward to switch to the next month."]'
 		);
 		await (
-			await page.$x( '//td[@role="button"]/*[text() = "15"]' )
+			await page.$x(
+				'//*[@role="application"][@aria-label="Calendar"]//td[@role="button"]/*[text() = "15"]'
+			)
 		 )[ 0 ].click();
 
 		await page.click( '.edit-post-post-visibility__toggle' );