google · benbowler · Sep 25, 2024 · Sep 25, 2024 · Sep 25, 2024 · Sep 25, 2024
diff --git a/assets/js/components/wp-dashboard/WPDashboardWidgets.stories.js b/assets/js/components/wp-dashboard/WPDashboardWidgets.stories.js
@@ -107,7 +107,7 @@ ReadyWithActivateAnalyticsCTA.args = {
 
 ReadyWithActivateAnalyticsCTA.scenario = {
 	label: 'Views/WPDashboardApp/WPDashboardWidgets/ReadyWithActivateAnalyticsCTA',
-	delay: 3000,
+	delay: 6000, // This extra delay is required to fix unstable VRTs.
 };
 
 export const ReadyWithCompleteAnalyticsActivationCTA = Template.bind( {} );

diff --git a/...tics-4/components/audience-segmentation/dashboard/AudienceSelectionPanel/index.stories.js b/...tics-4/components/audience-segmentation/dashboard/AudienceSelectionPanel/index.stories.js
@@ -274,6 +274,7 @@ AudienceCreationNoticeOneAdded.args = {
 };
 AudienceCreationNoticeOneAdded.scenario = {
 	label: 'Modules/Analytics4/Components/AudienceSegmentation/Dashboard/AudienceSelectionPanel/AudienceCreationNoticeOneAdded',
+	delay: 1500, // Delay here is required to prevent inconsistent rendering of the Create button text.
 };
 
 export const AudienceCreationNoticeWithOAuthError = Template.bind( {} );

diff --git a/docker/backstopjs/Dockerfile b/docker/backstopjs/Dockerfile
@@ -4,8 +4,21 @@ ARG BACKSTOPJS_VERSION=6.1.1
 
 ENV BACKSTOPJS_VERSION=$BACKSTOPJS_VERSION
 
+RUN apk add --no-cache \
+      chromium \
+      nss \
+      freetype \
+      harfbuzz \
+      ca-certificates \
+      ttf-freefont \
+      nodejs \
+      npm \ 
+      openrc \
+      dbus
+
+ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser
+
 RUN apk upgrade --no-cache --available && \
-    apk add --no-cache openrc dbus chromium nodejs npm && \
     PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true npm i -g backstopjs@${BACKSTOPJS_VERSION} && \
     npm cache clean -f && \
     rm -rf /root/.cache && \

diff --git a/stories/module-adsense-components.stories.js b/stories/module-adsense-components.stories.js
@@ -43,8 +43,8 @@ const generateAdSenseData = makeReportDataGenerator( getAdSenseMockResponse );
 
 // @TODO: Update it to GA4.
 const topEarningPagesArgs = {
-	startDate: '2020-08-15',
-	endDate: '2020-09-11',
+	startDate: '2021-08-15',
+	endDate: '2021-09-11',
 	dimensions: [ 'pageTitle', 'pagePath' ],
 	metrics: [ { name: 'totalAdRevenue' } ],
 	orderBys: [ { metric: { metricName: 'totalAdRevenue' } } ],
@@ -54,16 +54,16 @@ const topEarningPagesArgs = {
 // These components make a simple AdSense report query to determine the
 // currency that should be displayed in the report table.
 const getCurrencyFromReportOptions = {
-	startDate: '2020-08-15',
-	endDate: '2020-09-11',
+	startDate: '2021-08-15',
+	endDate: '2021-09-11',
 	metrics: 'ESTIMATED_EARNINGS',
 };
 
 generateReportBasedWidgetStories( {
 	moduleSlugs: [ 'adsense', 'analytics-4' ],
 	datastore: MODULES_ANALYTICS_4,
 	group: 'AdSense Module/Components/Dashboard/Top Earning Pages Widget',
-	referenceDate: '2020-09-12',
+	referenceDate: '2021-09-12',
 	...generateAnalyticsData( topEarningPagesArgs ),
 	options: topEarningPagesArgs,
 	setup: ( registry, variantName ) => {
@@ -97,10 +97,11 @@ generateReportBasedWidgetStories( {
 } );
 
 generateReportBasedWidgetStories( {
+	delay: 3000, // Allow time for the text resizing code to finish to prevent inconsistent rendering of chart during VRTs.
 	moduleSlugs: [ 'adsense' ],
 	datastore: MODULES_ADSENSE,
 	group: 'AdSense Module/Components/Module/Overview Widget',
-	referenceDate: '2020-11-25',
+	referenceDate: '2021-11-25',
 	zeroing,
 	...generateAdSenseData( [
 		{
@@ -110,8 +111,8 @@ generateReportBasedWidgetStories( {
 				'IMPRESSIONS',
 				'PAGE_VIEWS_CTR',
 			],
-			startDate: '2020-10-28',
-			endDate: '2020-11-24',
+			startDate: '2021-10-28',
+			endDate: '2021-11-24',
 		},
 		{
 			dimensions: [ 'DATE' ],
@@ -121,8 +122,8 @@ generateReportBasedWidgetStories( {
 				'IMPRESSIONS',
 				'PAGE_VIEWS_CTR',
 			],
-			startDate: '2020-10-28',
-			endDate: '2020-11-24',
+			startDate: '2021-10-28',
+			endDate: '2021-11-24',
 		},
 		{
 			metrics: [
@@ -131,8 +132,8 @@ generateReportBasedWidgetStories( {
 				'IMPRESSIONS',
 				'PAGE_VIEWS_CTR',
 			],
-			startDate: '2020-09-30',
-			endDate: '2020-10-27',
+			startDate: '2021-09-30',
+			endDate: '2021-10-27',
 		},
 		{
 			dimensions: [ 'DATE' ],
@@ -142,8 +143,8 @@ generateReportBasedWidgetStories( {
 				'IMPRESSIONS',
 				'PAGE_VIEWS_CTR',
 			],
-			startDate: '2020-09-30',
-			endDate: '2020-10-27',
+			startDate: '2021-09-30',
+			endDate: '2021-10-27',
 		},
 	] ),
 	additionalVariants: {

diff --git a/...reference/google-site-kit_AdSense_Module_Overview_Widget_0_document_0_small.png b/...reference/google-site-kit_AdSense_Module_Overview_Widget_0_document_0_small.png
diff --git a/...eference/google-site-kit_AdSense_Module_Overview_Widget_0_document_1_medium.png b/...eference/google-site-kit_AdSense_Module_Overview_Widget_0_document_1_medium.png
diff --git a/...reference/google-site-kit_AdSense_Module_Overview_Widget_0_document_2_large.png b/...reference/google-site-kit_AdSense_Module_Overview_Widget_0_document_2_large.png
diff --git a/...s/backstop/reference/google-site-kit_Global_ErrorHandler_0_document_0_small.png b/...s/backstop/reference/google-site-kit_Global_ErrorHandler_0_document_0_small.png
diff --git a/.../backstop/reference/google-site-kit_Global_ErrorHandler_0_document_1_medium.png b/.../backstop/reference/google-site-kit_Global_ErrorHandler_0_document_1_medium.png
diff --git a/...s/backstop/reference/google-site-kit_Global_ErrorHandler_0_document_2_large.png b/...s/backstop/reference/google-site-kit_Global_ErrorHandler_0_document_2_large.png
diff --git a/...SelectionPanel_Audience_creation_notice_with_OAuth_error_0_document_0_small.png b/...SelectionPanel_Audience_creation_notice_with_OAuth_error_0_document_0_small.png
diff --git a/...boardAllTrafficWidgetGA4_EntityDashboard_DataUnavailable_0_document_0_small.png b/...boardAllTrafficWidgetGA4_EntityDashboard_DataUnavailable_0_document_0_small.png
diff --git a/...oardAllTrafficWidgetGA4_EntityDashboard_DataUnavailable_0_document_1_medium.png b/...oardAllTrafficWidgetGA4_EntityDashboard_DataUnavailable_0_document_1_medium.png
diff --git a/...boardAllTrafficWidgetGA4_EntityDashboard_DataUnavailable_0_document_2_large.png b/...boardAllTrafficWidgetGA4_EntityDashboard_DataUnavailable_0_document_2_large.png
diff --git a/...gets_DashboardAllTrafficWidgetGA4_EntityDashboard_Loaded_0_document_0_small.png b/...gets_DashboardAllTrafficWidgetGA4_EntityDashboard_Loaded_0_document_0_small.png
diff --git a/...ets_DashboardAllTrafficWidgetGA4_EntityDashboard_Loaded_0_document_1_medium.png b/...ets_DashboardAllTrafficWidgetGA4_EntityDashboard_Loaded_0_document_1_medium.png
diff --git a/...gets_DashboardAllTrafficWidgetGA4_EntityDashboard_Loaded_0_document_2_large.png b/...gets_DashboardAllTrafficWidgetGA4_EntityDashboard_Loaded_0_document_2_large.png
diff --git a/...ashboardAllTrafficWidgetGA4_EntityDashboard_OneRowOfData_0_document_0_small.png b/...ashboardAllTrafficWidgetGA4_EntityDashboard_OneRowOfData_0_document_0_small.png
diff --git a/...shboardAllTrafficWidgetGA4_EntityDashboard_OneRowOfData_0_document_1_medium.png b/...shboardAllTrafficWidgetGA4_EntityDashboard_OneRowOfData_0_document_1_medium.png
diff --git a/...ashboardAllTrafficWidgetGA4_EntityDashboard_OneRowOfData_0_document_2_large.png b/...ashboardAllTrafficWidgetGA4_EntityDashboard_OneRowOfData_0_document_2_large.png
diff --git a/...ts_DashboardAllTrafficWidgetGA4_EntityDashboard_ZeroData_0_document_0_small.png b/...ts_DashboardAllTrafficWidgetGA4_EntityDashboard_ZeroData_0_document_0_small.png
diff --git a/...s_DashboardAllTrafficWidgetGA4_EntityDashboard_ZeroData_0_document_1_medium.png b/...s_DashboardAllTrafficWidgetGA4_EntityDashboard_ZeroData_0_document_1_medium.png
diff --git a/...ts_DashboardAllTrafficWidgetGA4_EntityDashboard_ZeroData_0_document_2_large.png b/...ts_DashboardAllTrafficWidgetGA4_EntityDashboard_ZeroData_0_document_2_large.png
diff --git a/...shboardAllTrafficWidgetGA4_MainDashboard_DataUnavailable_0_document_0_small.png b/...shboardAllTrafficWidgetGA4_MainDashboard_DataUnavailable_0_document_0_small.png
diff --git a/...hboardAllTrafficWidgetGA4_MainDashboard_DataUnavailable_0_document_1_medium.png b/...hboardAllTrafficWidgetGA4_MainDashboard_DataUnavailable_0_document_1_medium.png
diff --git a/...shboardAllTrafficWidgetGA4_MainDashboard_DataUnavailable_0_document_2_large.png b/...shboardAllTrafficWidgetGA4_MainDashboard_DataUnavailable_0_document_2_large.png
diff --git a/...idgets_DashboardAllTrafficWidgetGA4_MainDashboard_Loaded_0_document_0_small.png b/...idgets_DashboardAllTrafficWidgetGA4_MainDashboard_Loaded_0_document_0_small.png
diff --git a/...dgets_DashboardAllTrafficWidgetGA4_MainDashboard_Loaded_0_document_1_medium.png b/...dgets_DashboardAllTrafficWidgetGA4_MainDashboard_Loaded_0_document_1_medium.png
diff --git a/...idgets_DashboardAllTrafficWidgetGA4_MainDashboard_Loaded_0_document_2_large.png b/...idgets_DashboardAllTrafficWidgetGA4_MainDashboard_Loaded_0_document_2_large.png
diff --git a/..._DashboardAllTrafficWidgetGA4_MainDashboard_OneRowOfData_0_document_0_small.png b/..._DashboardAllTrafficWidgetGA4_MainDashboard_OneRowOfData_0_document_0_small.png
diff --git a/...DashboardAllTrafficWidgetGA4_MainDashboard_OneRowOfData_0_document_1_medium.png b/...DashboardAllTrafficWidgetGA4_MainDashboard_OneRowOfData_0_document_1_medium.png
diff --git a/..._DashboardAllTrafficWidgetGA4_MainDashboard_OneRowOfData_0_document_2_large.png b/..._DashboardAllTrafficWidgetGA4_MainDashboard_OneRowOfData_0_document_2_large.png
diff --git a/...gets_DashboardAllTrafficWidgetGA4_MainDashboard_ZeroData_0_document_0_small.png b/...gets_DashboardAllTrafficWidgetGA4_MainDashboard_ZeroData_0_document_0_small.png
diff --git a/...ets_DashboardAllTrafficWidgetGA4_MainDashboard_ZeroData_0_document_1_medium.png b/...ets_DashboardAllTrafficWidgetGA4_MainDashboard_ZeroData_0_document_1_medium.png
diff --git a/...gets_DashboardAllTrafficWidgetGA4_MainDashboard_ZeroData_0_document_2_large.png b/...gets_DashboardAllTrafficWidgetGA4_MainDashboard_ZeroData_0_document_2_large.png
diff --git a/...ets_DashboardOverallPageMetricsWidgetGA4_LoadedEntityURL_0_document_2_large.png b/...ets_DashboardOverallPageMetricsWidgetGA4_LoadedEntityURL_0_document_2_large.png
diff --git a/...sole_SearchFunnelWidgetGA4_ReadyWithActivateAnalyticsCTA_0_document_0_small.png b/...sole_SearchFunnelWidgetGA4_ReadyWithActivateAnalyticsCTA_0_document_0_small.png
diff --git a/...ole_SearchFunnelWidgetGA4_ReadyWithActivateAnalyticsCTA_0_document_1_medium.png b/...ole_SearchFunnelWidgetGA4_ReadyWithActivateAnalyticsCTA_0_document_1_medium.png
diff --git a/...sole_SearchFunnelWidgetGA4_ReadyWithActivateAnalyticsCTA_0_document_2_large.png b/...sole_SearchFunnelWidgetGA4_ReadyWithActivateAnalyticsCTA_0_document_2_large.png
diff --git a/...nsole_SearchFunnelWidgetGA4_ReadyWithCreateConversionCTA_0_document_0_small.png b/...nsole_SearchFunnelWidgetGA4_ReadyWithCreateConversionCTA_0_document_0_small.png
diff --git a/...sole_SearchFunnelWidgetGA4_ReadyWithCreateConversionCTA_0_document_1_medium.png b/...sole_SearchFunnelWidgetGA4_ReadyWithCreateConversionCTA_0_document_1_medium.png
diff --git a/...nsole_SearchFunnelWidgetGA4_ReadyWithCreateConversionCTA_0_document_2_large.png b/...nsole_SearchFunnelWidgetGA4_ReadyWithCreateConversionCTA_0_document_2_large.png