diff --git a/assets/js/modules/analytics-4/components/dashboard/DashboardOverallPageMetricsWidgetGA4.js b/assets/js/modules/analytics-4/components/dashboard/DashboardOverallPageMetricsWidgetGA4.js index e93f91bc0e8..1e13abdb966 100644 --- a/assets/js/modules/analytics-4/components/dashboard/DashboardOverallPageMetricsWidgetGA4.js +++ b/assets/js/modules/analytics-4/components/dashboard/DashboardOverallPageMetricsWidgetGA4.js @@ -19,9 +19,8 @@ /** * WordPress dependencies */ -import { _x, sprintf, _n, __ } from '@wordpress/i18n'; +import { _x, sprintf, _n } from '@wordpress/i18n'; import { isURL } from '@wordpress/url'; -import { useCallback } from '@wordpress/element'; /** * Internal dependencies @@ -40,11 +39,9 @@ import Sparkline from '../../../../components/Sparkline'; import SourceLink from '../../../../components/SourceLink'; import whenActive from '../../../../util/when-active'; import { calculateOverallPageMetricsData } from '../../utils/overall-page-metrics'; -import { getURLPath, trackEvent } from '../../../../util'; +import { getURLPath } from '../../../../util'; import WidgetHeaderTitle from '../../../../googlesitekit/widgets/components/WidgetHeaderTitle'; import useViewOnly from '../../../../hooks/useViewOnly'; -import useViewContext from '../../../../hooks/useViewContext'; -import NewBadge from '../../../../components/NewBadge'; import DataBlockGroup from '../../../../components/DataBlockGroup'; function DashboardOverallPageMetricsWidgetGA4( { Widget, WidgetReportError } ) { @@ -53,7 +50,6 @@ function DashboardOverallPageMetricsWidgetGA4( { Widget, WidgetReportError } ) { ); const viewOnlyDashboard = useViewOnly(); - const viewContext = useViewContext(); const dates = useSelect( ( select ) => select( CORE_USER ).getDateRangeDates( { @@ -139,18 +135,6 @@ function DashboardOverallPageMetricsWidgetGA4( { Widget, WidgetReportError } ) { select( CORE_USER ).getDateRangeNumberOfDays() ); - const sessionsLearnMoreURL = useSelect( ( select ) => - select( CORE_SITE ).getGoogleSupportURL( { - path: '/analytics/answer/9191807', - } ) - ); - - const engagementRateLearnMoreURL = useSelect( ( select ) => - select( CORE_SITE ).getGoogleSupportURL( { - path: '/analytics/answer/12195621', - } ) - ); - function Header() { return ( { - trackEvent( `${ viewContext }_ga4-new-badge`, 'click_learn_more_link' ); - }, [ viewContext ] ); - if ( isLoading || isGatheringData === undefined ) { return ( @@ -201,37 +181,6 @@ function DashboardOverallPageMetricsWidgetGA4( { Widget, WidgetReportError } ) { const data = calculateOverallPageMetricsData( report, dates.startDate ); - const badges = { - sessions: ( - - ), - engagementRate: ( - - ), - }; - - // Check if any of the data blocks have a badge. - // - // If no data blocks have a badge, we shouldn't even render an - // empty badge container, and save some vertical space in the `DataBlock`. - const hasMetricWithBadge = data.some( ( { metric } ) => { - return !! badges[ metric ]; - } ); - return ( @@ -260,9 +209,6 @@ function DashboardOverallPageMetricsWidgetGA4( { Widget, WidgetReportError } ) { gatheringData={ isGatheringData } /> } - badge={ - badges[ metric ] || hasMetricWithBadge - } /> ) diff --git a/assets/js/modules/reader-revenue-manager/components/common/PublicationOnboardingStateNotice.js b/assets/js/modules/reader-revenue-manager/components/common/PublicationOnboardingStateNotice.js index 2f151056d8c..aae44406b4f 100644 --- a/assets/js/modules/reader-revenue-manager/components/common/PublicationOnboardingStateNotice.js +++ b/assets/js/modules/reader-revenue-manager/components/common/PublicationOnboardingStateNotice.js @@ -54,8 +54,10 @@ export default function PublicationOnboardingStateNotice() { const serviceURL = useSelect( ( select ) => select( MODULES_READER_REVENUE_MANAGER ).getServiceURL( { - path: '/reader-revenue-manager', - publicationID, + path: 'reader-revenue-manager', + query: { + publication: publicationID, + }, } ) ); diff --git a/assets/js/modules/reader-revenue-manager/components/common/PublicationOnboardingStateNotice.test.js b/assets/js/modules/reader-revenue-manager/components/common/PublicationOnboardingStateNotice.test.js index cef8915eba1..dc110dd6194 100644 --- a/assets/js/modules/reader-revenue-manager/components/common/PublicationOnboardingStateNotice.test.js +++ b/assets/js/modules/reader-revenue-manager/components/common/PublicationOnboardingStateNotice.test.js @@ -114,8 +114,10 @@ describe( 'PublicationOnboardingStateNotice', () => { const expectedServiceURL = registry .select( MODULES_READER_REVENUE_MANAGER ) .getServiceURL( { - path: '/reader-revenue-manager', - publicationID: 'ABCDEFGH', + path: 'reader-revenue-manager', + query: { + publication: 'ABCDEFGH', + }, } ); // Ensure that CTA is present and class name is correct. diff --git a/assets/js/modules/reader-revenue-manager/components/dashboard/RRMSetupSuccessSubtleNotification.js b/assets/js/modules/reader-revenue-manager/components/dashboard/RRMSetupSuccessSubtleNotification.js index eaf07eda064..1fc3b54cddc 100644 --- a/assets/js/modules/reader-revenue-manager/components/dashboard/RRMSetupSuccessSubtleNotification.js +++ b/assets/js/modules/reader-revenue-manager/components/dashboard/RRMSetupSuccessSubtleNotification.js @@ -65,7 +65,10 @@ function RRMSetupSuccessSubtleNotification() { const serviceURL = useSelect( ( select ) => select( MODULES_READER_REVENUE_MANAGER ).getServiceURL( { - publicationID, + path: 'reader-revenue-manager', + query: { + publication: publicationID, + }, } ) ); diff --git a/assets/js/modules/reader-revenue-manager/components/settings/SettingsView.js b/assets/js/modules/reader-revenue-manager/components/settings/SettingsView.js index 1058106169f..23d23de21ea 100644 --- a/assets/js/modules/reader-revenue-manager/components/settings/SettingsView.js +++ b/assets/js/modules/reader-revenue-manager/components/settings/SettingsView.js @@ -43,8 +43,10 @@ export default function SettingsView() { const serviceURL = useSelect( ( select ) => select( MODULES_READER_REVENUE_MANAGER ).getServiceURL( { - path: '/reader-revenue-manager', - publicationID, + path: 'reader-revenue-manager', + query: { + publication: publicationID, + }, } ) ); diff --git a/assets/js/modules/reader-revenue-manager/datastore/service.js b/assets/js/modules/reader-revenue-manager/datastore/service.js index ab13feb9504..613be9c2b56 100644 --- a/assets/js/modules/reader-revenue-manager/datastore/service.js +++ b/assets/js/modules/reader-revenue-manager/datastore/service.js @@ -32,6 +32,7 @@ const selectors = { * Returns a link to the Reader Revenue Manager platform. * * @since 1.132.0 + * @since n.e.x.t Removed `publicationID` arg. * * @param {Object} state Data store's state. * @param {Object} [args] Object containing optional publication ID, path and query args. @@ -42,25 +43,18 @@ const selectors = { */ getServiceURL: createRegistrySelector( ( select ) => - ( state, { path, query, publicationID } = {} ) => { + ( state, { path, query } = {} ) => { let serviceURL = 'https://publishercenter.google.com'; - // Always add the utm_source. - query = { - ...query, - utm_source: 'sitekit', - }; - - if ( publicationID ) { - query.publication = publicationID; - } - if ( path ) { const sanitizedPath = `/${ path.replace( /^\//, '' ) }`; serviceURL = `${ serviceURL }${ sanitizedPath }`; } - serviceURL = addQueryArgs( serviceURL, query ); + serviceURL = addQueryArgs( serviceURL, { + ...query, + utm_source: 'sitekit', // Always add the utm_source. + } ); const accountChooserBaseURI = select( CORE_USER ).getAccountChooserURL( serviceURL ); diff --git a/assets/js/modules/reader-revenue-manager/datastore/service.test.js b/assets/js/modules/reader-revenue-manager/datastore/service.test.js index 7042e064be6..435c3886aff 100644 --- a/assets/js/modules/reader-revenue-manager/datastore/service.test.js +++ b/assets/js/modules/reader-revenue-manager/datastore/service.test.js @@ -69,25 +69,6 @@ describe( 'modules/reader-revenue-manager service store', () => { ); } ); - it( 'should append a publication ID to the URL', () => { - const publicationID = 'ABCDEFG'; - - const serviceURL = registry - .select( MODULES_READER_REVENUE_MANAGER ) - .getServiceURL( { - publicationID, - } ); - - const query = { - publication: publicationID, - utm_source: 'sitekit', - }; - - expect( decodeServiceURL( serviceURL ) ).toMatchQueryParameters( - query - ); - } ); - it( 'should add the path parameter', () => { const serviceURL = registry .select( MODULES_READER_REVENUE_MANAGER ) @@ -104,6 +85,7 @@ describe( 'modules/reader-revenue-manager service store', () => { const query = { param1: '1', param2: '2', + publicationID: 'ABCDEFG', }; const serviceURL = registry diff --git a/assets/js/modules/search-console/components/dashboard/SearchFunnelWidgetGA4/Overview/index.js b/assets/js/modules/search-console/components/dashboard/SearchFunnelWidgetGA4/Overview/index.js index 56ea5d7f8e2..fa28c5d9df6 100644 --- a/assets/js/modules/search-console/components/dashboard/SearchFunnelWidgetGA4/Overview/index.js +++ b/assets/js/modules/search-console/components/dashboard/SearchFunnelWidgetGA4/Overview/index.js @@ -327,14 +327,6 @@ export default function Overview( props ) { 4: quarterCellProps, }; - // Check if any of the data blocks have a badge. - // - // If no data blocks have a badge, we shouldn't even render an - // empty badge container, and save some vertical space in the `DataBlock`. - const hasMetricWithBadge = dataBlocks.some( ( { badge } ) => { - return !! badge; - } ); - return ( @@ -367,9 +359,6 @@ export default function Overview( props ) { } handleStatSelection={ handleStatsSelection } gatheringData={ dataBlock.isGatheringData } - badge={ - dataBlock.badge || hasMetricWithBadge - } /> ) ) } diff --git a/includes/Modules/Analytics_4/Conversion_Reporting/Conversion_Reporting_Events_Sync.php b/includes/Modules/Analytics_4/Conversion_Reporting/Conversion_Reporting_Events_Sync.php index edcbecbef30..ce23fc4919b 100644 --- a/includes/Modules/Analytics_4/Conversion_Reporting/Conversion_Reporting_Events_Sync.php +++ b/includes/Modules/Analytics_4/Conversion_Reporting/Conversion_Reporting_Events_Sync.php @@ -61,11 +61,11 @@ public function __construct( } /** - * Checks for available events and save them in settings. + * Syncs detected events into settings. * * @since 1.135.0 */ - public function check_for_events() { + public function sync_detected_events() { $report = $this->get_report(); $detected_events = array(); diff --git a/includes/Modules/Analytics_4/Conversion_Reporting/Conversion_Reporting_Provider.php b/includes/Modules/Analytics_4/Conversion_Reporting/Conversion_Reporting_Provider.php index 6042302c708..8bfc3008f91 100644 --- a/includes/Modules/Analytics_4/Conversion_Reporting/Conversion_Reporting_Provider.php +++ b/includes/Modules/Analytics_4/Conversion_Reporting/Conversion_Reporting_Provider.php @@ -45,11 +45,11 @@ class Conversion_Reporting_Provider { private Conversion_Reporting_Cron $cron; /** - * Conversion_Reporting_Events_Check instance. + * Conversion_Reporting_Events_Sync instance. * - * @var Conversion_Reporting_Events_Check + * @var Conversion_Reporting_Events_Sync */ - private Conversion_Reporting_Events_Sync $events_check; + private Conversion_Reporting_Events_Sync $events_sync; /** * Constructor. @@ -68,8 +68,8 @@ public function __construct( $this->user_options = $user_options; $this->analytics = $analytics; - $this->events_check = new Conversion_Reporting_Events_Sync( $settings, $this->analytics ); - $this->cron = new Conversion_Reporting_Cron( fn() => $this->cron_callback() ); + $this->events_sync = new Conversion_Reporting_Events_Sync( $settings, $this->analytics ); + $this->cron = new Conversion_Reporting_Cron( fn() => $this->cron_callback() ); } /** @@ -101,7 +101,7 @@ protected function cron_callback() { $owner_id = $this->analytics->get_owner_id(); $restore_user = $this->user_options->switch_user( $owner_id ); - $this->events_check->check_for_events(); + $this->events_sync->sync_detected_events(); $restore_user(); } diff --git a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_DataUnavailableEntityURL_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_DataUnavailableEntityURL_0_document_0_small.png index 5c92837b238..041c7a99d93 100644 Binary files a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_DataUnavailableEntityURL_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_DataUnavailableEntityURL_0_document_0_small.png differ diff --git a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_DataUnavailableEntityURL_0_document_1_medium.png b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_DataUnavailableEntityURL_0_document_1_medium.png index f191e5ca737..7082a4690c0 100644 Binary files a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_DataUnavailableEntityURL_0_document_1_medium.png and b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_DataUnavailableEntityURL_0_document_1_medium.png differ diff --git a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_DataUnavailableEntityURL_0_document_2_large.png b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_DataUnavailableEntityURL_0_document_2_large.png index d47dfe3489a..3294cc6768c 100644 Binary files a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_DataUnavailableEntityURL_0_document_2_large.png and b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_DataUnavailableEntityURL_0_document_2_large.png differ diff --git a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_DataUnavailable_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_DataUnavailable_0_document_0_small.png index 5c92837b238..041c7a99d93 100644 Binary files a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_DataUnavailable_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_DataUnavailable_0_document_0_small.png differ diff --git a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_DataUnavailable_0_document_1_medium.png b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_DataUnavailable_0_document_1_medium.png index f191e5ca737..7082a4690c0 100644 Binary files a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_DataUnavailable_0_document_1_medium.png and b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_DataUnavailable_0_document_1_medium.png differ diff --git a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_DataUnavailable_0_document_2_large.png b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_DataUnavailable_0_document_2_large.png index d47dfe3489a..3294cc6768c 100644 Binary files a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_DataUnavailable_0_document_2_large.png and b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_DataUnavailable_0_document_2_large.png differ diff --git a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_LoadedEntityURL_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_LoadedEntityURL_0_document_0_small.png index 9441a1d2e76..bdfa4a20a08 100644 Binary files a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_LoadedEntityURL_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_LoadedEntityURL_0_document_0_small.png differ diff --git a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_LoadedEntityURL_0_document_1_medium.png b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_LoadedEntityURL_0_document_1_medium.png index b69e4623575..6fb59779cad 100644 Binary files a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_LoadedEntityURL_0_document_1_medium.png and b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_LoadedEntityURL_0_document_1_medium.png differ diff --git a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_LoadedEntityURL_0_document_2_large.png b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_LoadedEntityURL_0_document_2_large.png index e24ae358199..d51b8f51750 100644 Binary files a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_LoadedEntityURL_0_document_2_large.png and b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_LoadedEntityURL_0_document_2_large.png differ diff --git a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_Ready_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_Ready_0_document_0_small.png index f444c9944e9..61da83f0f63 100644 Binary files a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_Ready_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_Ready_0_document_0_small.png differ diff --git a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_Ready_0_document_1_medium.png b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_Ready_0_document_1_medium.png index 0e53c2a6b99..a471c73d7b3 100644 Binary files a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_Ready_0_document_1_medium.png and b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_Ready_0_document_1_medium.png differ diff --git a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_Ready_0_document_2_large.png b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_Ready_0_document_2_large.png index 1942ccba938..2ba991ec28b 100644 Binary files a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_Ready_0_document_2_large.png and b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_Ready_0_document_2_large.png differ diff --git a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_ZeroDataEntityURL_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_ZeroDataEntityURL_0_document_0_small.png index 6b291680249..b01ab1690ac 100644 Binary files a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_ZeroDataEntityURL_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_ZeroDataEntityURL_0_document_0_small.png differ diff --git a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_ZeroDataEntityURL_0_document_1_medium.png b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_ZeroDataEntityURL_0_document_1_medium.png index 52524878716..bc56fd8a281 100644 Binary files a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_ZeroDataEntityURL_0_document_1_medium.png and b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_ZeroDataEntityURL_0_document_1_medium.png differ diff --git a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_ZeroDataEntityURL_0_document_2_large.png b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_ZeroDataEntityURL_0_document_2_large.png index ad25c95713c..a813c1a8a0d 100644 Binary files a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_ZeroDataEntityURL_0_document_2_large.png and b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_ZeroDataEntityURL_0_document_2_large.png differ diff --git a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_ZeroData_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_ZeroData_0_document_0_small.png index 6b291680249..b01ab1690ac 100644 Binary files a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_ZeroData_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_ZeroData_0_document_0_small.png differ diff --git a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_ZeroData_0_document_1_medium.png b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_ZeroData_0_document_1_medium.png index 52524878716..bc56fd8a281 100644 Binary files a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_ZeroData_0_document_1_medium.png and b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_ZeroData_0_document_1_medium.png differ diff --git a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_ZeroData_0_document_2_large.png b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_ZeroData_0_document_2_large.png index ad25c95713c..a813c1a8a0d 100644 Binary files a/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_ZeroData_0_document_2_large.png and b/tests/backstop/reference/google-site-kit_Modules_Analytics4_Widgets_DashboardOverallPageMetricsWidgetGA4_ZeroData_0_document_2_large.png differ diff --git a/tests/phpunit/integration/Modules/Analytics_4/Conversion_Reporting/Conversion_Reporting_Events_SyncTest.php b/tests/phpunit/integration/Modules/Analytics_4/Conversion_Reporting/Conversion_Reporting_Events_SyncTest.php index 5306259bc3b..895a5683797 100644 --- a/tests/phpunit/integration/Modules/Analytics_4/Conversion_Reporting/Conversion_Reporting_Events_SyncTest.php +++ b/tests/phpunit/integration/Modules/Analytics_4/Conversion_Reporting/Conversion_Reporting_Events_SyncTest.php @@ -58,11 +58,11 @@ public function set_up() { /** * @dataProvider report_dimensions */ - public function test_check_for_events( $detected_events, $report_rows ) { + public function test_sync_detected_events( $detected_events, $report_rows ) { $this->setup_fake_handler_and_analytics( $report_rows ); $event_check = $this->get_instance(); - $event_check->check_for_events(); + $event_check->sync_detected_events(); $this->assertEquals( $detected_events, $this->settings->get()['detectedEvents'] ); }