Merge pull request #8588 from google/followup/8473-conversion-id-rename

google · Apr 18, 2024 · 6fe9fce · 6fe9fce
2 parents ec3f4cf + 5ca2663
commit 6fe9fce
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/includes/Modules/Ads.php b/includes/Modules/Ads.php
@@ -181,8 +181,8 @@ public function get_debug_fields() {
 		$settings = $this->get_settings()->get();
 
 		return array(
-			'conversion_tracking_id' => array(
-				'label' => __( 'Conversion Tracking ID', 'google-site-kit' ),
+			'ads_conversion_tracking_id' => array(
+				'label' => __( 'Ads Conversion Tracking ID', 'google-site-kit' ),
 				'value' => $settings['conversionID'],
 				'debug' => Debug_Data::redact_debug_value( $settings['conversionID'] ),
 			),

diff --git a/includes/Modules/Analytics_4.php b/includes/Modules/Analytics_4.php
@@ -395,11 +395,6 @@ public function get_debug_fields() {
 				'value' => $settings['accountID'],
 				'debug' => Debug_Data::redact_debug_value( $settings['accountID'] ),
 			),
-			'analytics_4_ads_conversion_id'           => array(
-				'label' => __( 'Analytics Ads conversion ID', 'google-site-kit' ),
-				'value' => $settings['adsConversionID'],
-				'debug' => Debug_Data::redact_debug_value( $settings['adsConversionID'] ),
-			),
 			'analytics_4_property_id'                 => array(
 				'label' => __( 'Analytics property ID', 'google-site-kit' ),
 				'value' => $settings['propertyID'],
@@ -420,6 +415,11 @@ public function get_debug_fields() {
 				'value' => $settings['useSnippet'] ? __( 'Yes', 'google-site-kit' ) : __( 'No', 'google-site-kit' ),
 				'debug' => $settings['useSnippet'] ? 'yes' : 'no',
 			),
+			'analytics_4_ads_conversion_id'           => array(
+				'label' => __( 'Analytics Ads conversion ID', 'google-site-kit' ),
+				'value' => $settings['adsConversionID'],
+				'debug' => Debug_Data::redact_debug_value( $settings['adsConversionID'] ),
+			),
 			'analytics_4_available_custom_dimensions' => array(
 				'label' => __( 'Analytics available custom dimensions', 'google-site-kit' ),
 				'value' => empty( $settings['availableCustomDimensions'] )

diff --git a/tests/phpunit/integration/Modules/AdsTest.php b/tests/phpunit/integration/Modules/AdsTest.php
@@ -58,15 +58,15 @@ public function test_get_debug_fields() {
 
 		$this->assertEqualSets(
 			array(
-				'conversion_tracking_id',
+				'ads_conversion_tracking_id',
 			),
 			array_keys( $ads->get_debug_fields() )
 		);
 
 		$this->assertEquals(
 			array(
-				'conversion_tracking_id' => array(
-					'label' => 'Conversion Tracking ID',
+				'ads_conversion_tracking_id' => array(
+					'label' => 'Ads Conversion Tracking ID',
 					'value' => 'AW-123456789',
 					'debug' => 'AW-1••••••••',
 				),