Update module slug to match Analytics module slug.

google · Jan 11, 2024 · 8612fe9 · 8612fe9
1 parent bd5892c
commit 8612fe9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/includes/Modules/Analytics/Advanced_Tracking.php b/includes/Modules/Analytics/Advanced_Tracking.php
@@ -15,6 +15,7 @@
 use Google\Site_Kit\Modules\Analytics\Advanced_Tracking\Script_Injector;
 use Google\Site_Kit\Modules\Analytics\Advanced_Tracking\AMP_Config_Injector;
 use Google\Site_Kit\Modules\Analytics\Advanced_Tracking\Event_List_Registry;
+use Google\Site_Kit\Modules\Analytics_4;
 
 /**
  * Class for Google Analytics Advanced Event Tracking.
@@ -68,8 +69,10 @@ public function __construct( Context $context ) {
 	 * @since 1.118.0 Renamed hooks to target Analytics 4 module.
 	 */
 	public function register() {
+		$slug_name = Analytics_4::MODULE_SLUG;
+
 		add_action(
-			'googlesitekit_analytics_4_init_tag',
+			"googlesitekit_{$slug_name}_init_tag",
 			function() {
 				$this->register_event_lists();
 				add_action(
@@ -81,7 +84,7 @@ function() {
 			}
 		);
 		add_action(
-			'googlesitekit_analytics_4_init_tag_amp',
+			"googlesitekit_{$slug_name}_init_tag_amp",
 			function() {
 				$this->register_event_lists();
 				add_filter(

diff --git a/tests/phpunit/integration/Modules/Analytics/Advanced_TrackingTest.php b/tests/phpunit/integration/Modules/Analytics/Advanced_TrackingTest.php
@@ -26,20 +26,20 @@ class Advanced_TrackingTest extends TestCase {
 	public function test_register() {
 		$advanced_tracking = new Advanced_Tracking( new Context( GOOGLESITEKIT_PLUGIN_MAIN_FILE ) );
 
-		remove_all_actions( 'googlesitekit_analytics_4_init_tag' );
-		remove_all_actions( 'googlesitekit_analytics_4_init_tag_amp' );
+		remove_all_actions( 'googlesitekit_analytics-4_init_tag' );
+		remove_all_actions( 'googlesitekit_analytics-4_init_tag_amp' );
 
 		$advanced_tracking->register();
 
-		$this->assertTrue( has_action( 'googlesitekit_analytics_4_init_tag' ) );
-		$this->assertTrue( has_action( 'googlesitekit_analytics_4_init_tag_amp' ) );
+		$this->assertTrue( has_action( 'googlesitekit_analytics-4_init_tag' ) );
+		$this->assertTrue( has_action( 'googlesitekit_analytics-4_init_tag_amp' ) );
 
 		remove_all_actions( 'wp_footer' );
-		do_action( 'googlesitekit_analytics_4_init_tag', 'G-1A2BCD345E' );
+		do_action( 'googlesitekit_analytics-4_init_tag', 'G-1A2BCD345E' );
 		$this->assertTrue( has_action( 'wp_footer' ) );
 
 		remove_all_filters( 'googlesitekit_amp_gtag_opt' );
-		do_action( 'googlesitekit_analytics_4_init_tag_amp', 'G-1A2BCD345E' );
+		do_action( 'googlesitekit_analytics-4_init_tag_amp', 'G-1A2BCD345E' );
 		$this->assertTrue( has_filter( 'googlesitekit_amp_gtag_opt' ) );
 	}
 
@@ -52,7 +52,7 @@ public function test_register_event_lists_fixed() {
 		$this->add_action_register_event_list( $event_list );
 
 		// Triggers Advanced_Tracking::register_event_lists() call.
-		do_action( 'googlesitekit_analytics_4_init_tag', 'G-1A2BCD345E' );
+		do_action( 'googlesitekit_analytics-4_init_tag', 'G-1A2BCD345E' );
 
 		$this->assertCount( 2, $event_list->get_events() ); // The class adds 2 events during registration.
 	}
@@ -75,7 +75,7 @@ public function test_register_event_lists_dynamic() {
 		remove_all_actions( 'the_post' );
 
 		// Triggers Advanced_Tracking::register_event_lists() call.
-		do_action( 'googlesitekit_analytics_4_init_tag', 'G-1A2BCD345E' );
+		do_action( 'googlesitekit_analytics-4_init_tag', 'G-1A2BCD345E' );
 
 		// Reset original query after change above and check whether the 'the_post' hook from
 		// Dynamic_Blog_Post_Link_Event_List was added.
@@ -94,7 +94,7 @@ public function test_compile_events() {
 		}
 
 		// Triggers Advanced_Tracking::register_event_lists() call.
-		do_action( 'googlesitekit_analytics_4_init_tag_amp', 'G-1A2BCD345E' );
+		do_action( 'googlesitekit_analytics-4_init_tag_amp', 'G-1A2BCD345E' );
 
 		// Triggers Advanced_Tracking::compile_events() call.
 		apply_filters( 'googlesitekit_amp_gtag_opt', array() );