From eb315c3f75bec6ad43b374dcd9190266888bc763 Mon Sep 17 00:00:00 2001
From: Thomas Roberts <thomas.roberts@automattic.com>
Date: Wed, 23 Aug 2023 11:24:23 +0100
Subject: [PATCH] Ensure we're logged out before trying to log in as a user

---
 tests/e2e/auth.setup.ts | 66 +++++++++++++++++++++--------------------
 1 file changed, 34 insertions(+), 32 deletions(-)

diff --git a/tests/e2e/auth.setup.ts b/tests/e2e/auth.setup.ts
index b7a9137113d..a9198392235 100644
--- a/tests/e2e/auth.setup.ts
+++ b/tests/e2e/auth.setup.ts
@@ -11,21 +11,25 @@ import { customer, admin } from './test-data/data/data';
 
 setup( 'authenticate as admin', async ( { page } ) => {
 	await page.goto( '/my-account' );
-	const isLoggedOut = await page
+	const isLoggedIn = await page
 		.getByLabel( 'Username or email address' )
-		.isVisible();
+		.isHidden();
 
-	if ( isLoggedOut ) {
+	if ( isLoggedIn ) {
 		await page
-			.getByLabel( 'Username or email address' )
-			.fill( admin.username );
-		await page.getByLabel( 'Password' ).fill( admin.password );
-		await page.getByRole( 'button', { name: 'Log in' } ).click();
-		// Sometimes login flow sets cookies in the process of several redirects.
-		// Wait for the final URL to ensure that the cookies are actually set.
-		await page.waitForURL( '/my-account/' );
+			.getByRole( 'paragraph' )
+			.filter( { hasText: /Hello .* \(not .*? Log out\)/ } )
+			.getByRole( 'link', { name: 'Log out' } )
+			.click();
 	}
 
+	await page.getByLabel( 'Username or email address' ).fill( admin.username );
+	await page.getByLabel( 'Password' ).fill( admin.password );
+	await page.getByRole( 'button', { name: 'Log in' } ).click();
+	// Sometimes login flow sets cookies in the process of several redirects.
+	// Wait for the final URL to ensure that the cookies are actually set.
+	await page.waitForURL( '/my-account/' );
+
 	await expect(
 		page
 			.getByRole( 'list' )
@@ -41,20 +45,25 @@ setup( 'authenticate as admin', async ( { page } ) => {
 
 setup( 'authenticate as customer', async ( { page } ) => {
 	await page.goto( '/my-account' );
-	const isLoggedOut = await page
+	const isLoggedIn = await page
 		.getByLabel( 'Username or email address' )
-		.isVisible();
+		.isHidden();
 
-	if ( isLoggedOut ) {
+	if ( isLoggedIn ) {
 		await page
-			.getByLabel( 'Username or email address' )
-			.fill( customer.username );
-		await page.getByLabel( 'Password' ).fill( customer.password );
-		await page.getByRole( 'button', { name: 'Log in' } ).click();
-		// Sometimes login flow sets cookies in the process of several redirects.
-		// Wait for the final URL to ensure that the cookies are actually set.
-		await page.waitForURL( '/my-account/' );
+			.getByRole( 'paragraph' )
+			.filter( { hasText: /Hello .* \(not .*? Log out\)/ } )
+			.getByRole( 'link', { name: 'Log out' } )
+			.click();
 	}
+	await page
+		.getByLabel( 'Username or email address' )
+		.fill( customer.username );
+	await page.getByLabel( 'Password' ).fill( customer.password );
+	await page.getByRole( 'button', { name: 'Log in' } ).click();
+	// Sometimes login flow sets cookies in the process of several redirects.
+	// Wait for the final URL to ensure that the cookies are actually set.
+	await page.waitForURL( '/my-account/' );
 
 	await expect(
 		page
@@ -71,23 +80,16 @@ setup( 'authenticate as customer', async ( { page } ) => {
 
 setup( 'authenticate as guest', async ( { page } ) => {
 	await page.goto( '/my-account' );
-	const isLoggedOut = await page
+	const isLoggedIn = await page
 		.getByLabel( 'Username or email address' )
-		.isVisible();
+		.isHidden();
 
-	if ( ! isLoggedOut ) {
+	if ( isLoggedIn ) {
 		await page
-			.getByRole( 'list' )
-			.filter( {
-				hasText:
-					'Dashboard Orders Downloads Addresses Account details Log out',
-			} )
+			.getByRole( 'paragraph' )
+			.filter( { hasText: /Hello .* \(not .*? Log out\)/ } )
 			.getByRole( 'link', { name: 'Log out' } )
 			.click();
-
-		// Sometimes login flow sets cookies in the process of several redirects.
-		// Wait for the final URL to ensure that the cookies are actually set.
-		await page.waitForURL( '/my-account/' );
 	}
 
 	await expect(