E2E improvements.

woocommerce · Oct 25, 2024 · d363edc · d363edc
1 parent 7f20af7
commit d363edc
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 208 deletions.
diff --git a/js/src/hooks/useGoogleAdsAccountReady.js b/js/src/hooks/useGoogleAdsAccountReady.js
@@ -11,15 +11,25 @@ import useGoogleAdsAccountStatus from '.~/hooks/useGoogleAdsAccountStatus';
  * @return {boolean|null} Whether the Google Ads account is ready. `null` if the state is not yet determined.
  */
 const useGoogleAdsAccountReady = () => {
-	const { hasGoogleAdsConnection } = useGoogleAdsAccount();
-	const { hasAccess, step } = useGoogleAdsAccountStatus();
+	const {
+		hasGoogleAdsConnection,
+		hasFinishedResolution: adsAccountResolved,
+	} = useGoogleAdsAccount();
+	const {
+		hasAccess,
+		step,
+		hasFinishedResolution: adsAccountStatusResolved,
+	} = useGoogleAdsAccountStatus();
 
-	const isReady =
+	if ( ! adsAccountResolved || ! adsAccountStatusResolved ) {
+		return null;
+	}
+
+	return (
 		hasGoogleAdsConnection &&
 		hasAccess &&
-		[ '', 'billing', 'link_merchant' ].includes( step );
-
-	return isReady === null ? null : !! isReady;
+		[ '', 'billing', 'link_merchant' ].includes( step )
+	);
 };
 
 export default useGoogleAdsAccountReady;
diff --git a/js/src/hooks/useGoogleMCAccount.js b/js/src/hooks/useGoogleMCAccount.js
@@ -65,10 +65,9 @@ const useGoogleMCAccount = () => {
 			].includes( acc?.status );
 
 			const isReady =
-				hasGoogleMCConnection &&
-				( acc.status === GOOGLE_MC_ACCOUNT_STATUS.CONNECTED ||
-					( acc.status === GOOGLE_MC_ACCOUNT_STATUS.INCOMPLETE &&
-						acc?.step === 'link_ads' ) );
+				acc?.status === GOOGLE_MC_ACCOUNT_STATUS.CONNECTED ||
+				( acc?.status === GOOGLE_MC_ACCOUNT_STATUS.INCOMPLETE &&
+					acc?.step === 'link_ads' );
 
 			return {
 				googleMCAccount: acc,

diff --git a/tests/e2e/specs/setup-mc/step-1-accounts.test.js b/tests/e2e/specs/setup-mc/step-1-accounts.test.js
@@ -215,91 +215,25 @@ test.describe( 'Set up accounts', () => {
 		test( 'should create merchant center and ads account if does not exist for the user', async () => {
 			await setUpAccountsPage.mockJetpackConnected();
 			await setUpAccountsPage.mockGoogleConnected();
-			await setUpAccountsPage.mockAdsAccountDisconnected();
-			await setUpAccountsPage.mockMCNotConnected();
-
-			await setUpAccountsPage.fulfillAdsAccounts(
-				[
-					[],
-					[
-						{
-							id: 78787878,
-							name: 'gla',
-						},
-					],
-				],
-				200,
-				[ 'GET' ],
-				true
-			);
 
-			await setUpAccountsPage.fulfillMCAccounts(
-				[
-					[],
-					[
-						{
-							id: 5432178,
-							name: null,
-							subaccount: null,
-							domain: null,
-						},
-					],
-				],
-				200,
-				'GET',
-				true
-			);
+			await setUpAccountsPage.fulfillAdsAccounts( [ { id: 1 } ] );
+			await setUpAccountsPage.mockMCHasAccounts();
+			await setUpAccountsPage.mockAdsAccountIncomplete();
+			await setUpAccountsPage.mockMCConnected();
 
-			await setUpAccountsPage.fulfillAdsConnection(
-				[
-					{
-						id: 0,
-						currency: 'USD',
-						status: 'disconnected',
-						symbol: '$',
-					},
-					{
-						id: 78787878,
-						currency: 'USD',
-						status: 'incomplete',
-						step: 'account_access',
-						sub_account: true,
-						symbol: '$',
-					},
-				],
-				200,
-				'GET',
-				true
-			);
+			const once = setUpAccountsPage.fulfillTimes( 1 );
 
-			await setUpAccountsPage.fulfillMCConnection(
-				[
-					{
-						id: 0,
-						name: null,
-						subaccount: null,
-						domain: null,
-					},
-					{
-						id: 5432178,
-						name: null,
-						subaccount: null,
-						domain: null,
-						status: 'incomplete',
-						step: 'claim',
-					},
-				],
-				200,
-				'GET',
-				true
-			);
+			await once.mockAdsHasNoAccounts();
+			await once.mockMCHasNoAccounts();
+			await once.mockAdsAccountDisconnected();
+			await once.mockMCNotConnected();
 
 			await setUpAccountsPage.goto();
 			const googleAccountCard = setUpAccountsPage.getGoogleAccountCard();
 
 			await expect(
 				googleAccountCard.getByText(
-					/You don’t have Merchant Center nor Google Ads accounts, so we’re creating them for you./,
+					'You don’t have Merchant Center nor Google Ads accounts, so we’re creating them for you.',
 					{
 						exact: true,
 					}
@@ -318,6 +252,16 @@ test.describe( 'Set up accounts', () => {
 			} );
 
 			test( 'should see the merchant center id and ads account id if connected', async () => {
+				await setUpAccountsPage.fulfillAdsAccounts( [ { id: 12345 } ] );
+				await setUpAccountsPage.mockAdsAccountConnected();
+				await setUpAccountsPage.mockMCConnected();
+				await setUpAccountsPage.mockMCHasAccounts();
+				await setUpAccountsPage.fulfillAdsAccountStatus( {
+					has_access: true,
+					invite_link: '',
+					step: 'link_merchant',
+				} );
+
 				const googleAccountCard =
 					setUpAccountsPage.getGoogleAccountCard();
 				await expect(
@@ -331,26 +275,6 @@ test.describe( 'Set up accounts', () => {
 						exact: true,
 					} )
 				).toBeVisible();
-			} );
-
-			test( 'should see the connected label', async () => {
-				const googleAccountCard =
-					setUpAccountsPage.getGoogleAccountCard();
-
-				await setUpAccountsPage.fulfillAdsAccountStatus( {
-					has_access: true,
-					invite_link: '',
-					step: 'link_merchant',
-				} );
-
-				await setUpAccountsPage.fulfillMCConnection( {
-					id: 1234,
-					name: 'Test Merchant Center',
-					subaccount: null,
-					domain: 'example.com',
-					status: 'connected',
-					step: '',
-				} );
 
 				await expect(
 					googleAccountCard.getByText( 'Connected', { exact: true } )