Merge pull request #10103 from google/fix/8229-e2e-tests

Update api-cache test to be more stable when running quickly

Author: tofumatt

assets/js/components/KeyMetrics/hooks/useDisplayCTAWidget.test.js

@@ -107,10 +107,14 @@ describe( 'useDisplayCTAWidget hook', () => {
 			)
 		);
 
-		const { result } = await renderHook( () => useDisplayCTAWidget(), {
-			registry,
-		} );
+		const { result, waitForRegistry } = await renderHook(
+			() => useDisplayCTAWidget(),
+			{
+				registry,
+			}
+		);
 
+		await waitForRegistry();
 		expect( result.current ).toBe( false );
 	} );
 
@@ -125,10 +129,14 @@ describe( 'useDisplayCTAWidget hook', () => {
 			)
 		);
 
-		const { result } = await renderHook( () => useDisplayCTAWidget(), {
-			registry,
-		} );
+		const { result, waitForRegistry } = await renderHook(
+			() => useDisplayCTAWidget(),
+			{
+				registry,
+			}
+		);
 
+		await waitForRegistry();
 		expect( result.current ).toBe( false );
 	} );
 } );

tests/e2e/mu-plugins/e2e-rest-time-endpoint.php

@@ -26,7 +26,7 @@ function () {
 				'callback'            => function () {
 					return array(
 						'time'      => time(),
-						'microtime' => microtime(),
+						'microtime' => microtime( true ),
 					);
 				},
 				'permission_callback' => '__return_true',

tests/e2e/specs/api-cache.test.js

@@ -78,7 +78,7 @@ describe( 'API cache', () => {
 
 		const initialTimeData = await googleSiteKitAPIGetTime();
 		expect( initialTimeData ).toMatchObject( {
-			time: expect.any( Number ),
+			microtime: expect.any( Number ),
 		} );
 
 		// Show that the data is cached when fetching again.
@@ -99,9 +99,12 @@ describe( 'API cache', () => {
 		// Now that we're in a new session, we expect the API cache to be clear
 		// so the request should hit the backend and produce a new (greater) value.
 		const newTimeData = await googleSiteKitAPIGetTime();
+		expect( newTimeData ).not.toEqual( initialTimeData );
 		expect( initialTimeData ).toMatchObject( {
-			time: expect.any( Number ),
+			microtime: expect.any( Number ),
 		} );
-		expect( newTimeData.time ).toBeGreaterThan( initialTimeData.time );
+		expect( newTimeData.microtime ).toBeGreaterThan(
+			initialTimeData.microtime
+		);
 	} );
 } );

tests/js/test-utils.js

@@ -208,8 +208,11 @@ const customRenderHook = ( callback, options = {} ) => {
 		);
 	}
 
+	const waitForRegistry = createWaitForRegistry( registry );
+
 	return {
 		...renderHook( callback, { wrapper: Wrapper, ...renderHookOptions } ),
+		waitForRegistry: () => actHook( waitForRegistry ),
 		setInView,
 		registry,
 	};