Merge pull request #7488 from ampproject/fix/flaky-e2e-tests

Fix flaky e2e tests
ampproject · Mar 16, 2023 · 96cdfb9 · 96cdfb9
2 parents 0f81395 + 0dedc64
commit 96cdfb9
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 0 deletions.
diff --git a/tests/e2e/specs/core-themes/twentyfifteen.js b/tests/e2e/specs/core-themes/twentyfifteen.js
@@ -81,6 +81,10 @@ describe('Twenty Fifteen theme on AMP', () => {
 		it('should have a togglable submenu', async () => {
 			await expect(page).toClick('.site-header .secondary-toggle');
 
+			await page.waitForSelector(
+				'#site-navigation .menu-item-has-children'
+			);
+
 			const menuItemWithSubmenu = await page.$(
 				'#site-navigation .menu-item-has-children'
 			);

diff --git a/tests/e2e/specs/core-themes/twentynineteen.js b/tests/e2e/specs/core-themes/twentynineteen.js
@@ -54,6 +54,10 @@ describe('Twenty Nineteen theme on AMP', () => {
 		it('should have a togglable submenu', async () => {
 			await expect(page).toMatchElement('.main-navigation');
 
+			await page.waitForSelector(
+				'.main-navigation .menu-item-has-children'
+			);
+
 			const menuItemWithSubmenu = await page.$(
 				'.main-navigation .menu-item-has-children'
 			);

diff --git a/tests/e2e/specs/core-themes/twentyseventeen.js b/tests/e2e/specs/core-themes/twentyseventeen.js
@@ -75,6 +75,10 @@ describe('Twenty Seventeen theme on AMP', () => {
 		it('should have a togglable submenu', async () => {
 			await expect(page).toClick('.main-navigation .menu-toggle');
 
+			await page.waitForSelector(
+				'.main-navigation .menu-item-has-children'
+			);
+
 			const menuItemWithSubmenu = await page.$(
 				'.main-navigation .menu-item-has-children'
 			);

diff --git a/tests/e2e/specs/core-themes/twentysixteen.js b/tests/e2e/specs/core-themes/twentysixteen.js
@@ -81,6 +81,10 @@ describe('Twenty Sixteen theme on AMP', () => {
 		it('should have a togglable submenu', async () => {
 			await expect(page).toClick('#menu-toggle');
 
+			await page.waitForSelector(
+				'#site-navigation .menu-item-has-children'
+			);
+
 			const menuItemWithSubmenu = await page.$(
 				'#site-navigation .menu-item-has-children'
 			);

diff --git a/tests/e2e/specs/core-themes/twentythirteen.js b/tests/e2e/specs/core-themes/twentythirteen.js
@@ -81,6 +81,10 @@ describe('Twenty Thirteen theme on AMP', () => {
 		it('should have a togglable submenu', async () => {
 			await expect(page).toClick('#site-navigation .menu-toggle');
 
+			await page.waitForSelector(
+				'#site-navigation .nav-menu .menu-item-has-children'
+			);
+
 			const menuItemWithSubmenu = await page.$(
 				'#site-navigation .nav-menu .menu-item-has-children'
 			);

diff --git a/tests/e2e/specs/core-themes/twentytwenty.js b/tests/e2e/specs/core-themes/twentytwenty.js
@@ -76,6 +76,10 @@ describe('Twenty Twenty theme on AMP', () => {
 			it('should have a togglable submenu', async () => {
 				await expect(page).toClick('.mobile-nav-toggle');
 
+				await page.waitForSelector(
+					'.menu-modal .menu-item-has-children'
+				);
+
 				const menuItemWithSubmenu = await page.$(
 					'.menu-modal .menu-item-has-children'
 				);

diff --git a/tests/e2e/specs/core-themes/twentytwentytwo.js b/tests/e2e/specs/core-themes/twentytwentytwo.js
@@ -62,6 +62,8 @@ describe('Twenty Twenty-Two theme on AMP', () => {
 		});
 
 		it('should be togglable', async () => {
+			await page.waitForSelector(pageHeaderSelector);
+
 			const pageHeaderElement = await page.$(pageHeaderSelector);
 			expect(pageHeaderElement).not.toBeNull();