Fix E2E tests.

sayanm085 · Mar 7, 2024 · 5ac4486 · 5ac4486
1 parent e342f24
commit 5ac4486
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/includes/Modules/Analytics_4.php b/includes/Modules/Analytics_4.php
@@ -628,8 +628,7 @@ private function print_tracking_opt_out() {
 	 * @return bool
 	 */
 	protected function is_tracking_disabled() {
-		// @TODO Revert this when we use the new GA4 SettingsEdit form once #7932 is merged and we save all settings to the Analytics-4 module.
-		$settings = ( new Analytics( $this->context ) )->get_settings()->get();
+		$settings = $this->get_settings()->get();
 
 		// This filter is documented in Tag_Manager::filter_analytics_allow_tracking_disabled.
 		if ( ! apply_filters( 'googlesitekit_allow_tracking_disabled', $settings['useSnippet'] ) ) {

diff --git a/tests/phpunit/integration/Modules/Analytics_4Test.php b/tests/phpunit/integration/Modules/Analytics_4Test.php
@@ -2890,10 +2890,6 @@ public function test_tracking_opt_out_snippet( $settings, $logged_in, $is_tracki
 		$analytics = new Analytics_4( new Context( GOOGLESITEKIT_PLUGIN_MAIN_FILE ) );
 		$analytics->get_settings()->set( $settings );
 
-		// TODO Remove this when #7932 and #8082 are merged which save and migrate the new GA4 settings.
-		// This saves the trackingDisabled setting to the Analytics module which is being used temporarily.
-		( new Analytics( new Context( GOOGLESITEKIT_PLUGIN_MAIN_FILE ) ) )->get_settings()->merge( array( 'trackingDisabled' => $settings['trackingDisabled'] ) );
-
 		remove_all_actions( 'template_redirect' );
 		$analytics->register();
 		do_action( 'template_redirect' );