Revert "Add/user tracking option api (#9003)"

This reverts commit c9b754c.
Automattic · Mar 27, 2018 · 9709cc4 · 9709cc4
1 parent af241c0
commit 9709cc4
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 112 deletions.
diff --git a/_inc/lib/class.jetpack-user-event-tracking.php b/_inc/lib/class.jetpack-user-event-tracking.php
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -13,7 +13,6 @@
 			<file>tests/php/test_class.jetpack-constants.php</file>
 			<file>tests/php/test_class.jetpack-connection-banner.php</file>
 			<file>tests/php/test_class.jetpack-options.php</file>
-			<file>tests/php/test_class.jetpack-user-event-tracking.php</file>
 		</testsuite>
 		<testsuite name="php-lint">
 			<file phpVersion="5.3.0" phpVersionOperator="lte">tests/php/test_php-lint.php</file>

diff --git a/sync/class.jetpack-sync-defaults.php b/sync/class.jetpack-sync-defaults.php
@@ -192,8 +192,7 @@ public static function get_constants_whitelist() {
 		'hosting_provider'                 => array( 'Jetpack_Sync_Functions', 'get_hosting_provider' ),
 		'locale'                           => 'get_locale',
 		'site_icon_url'                    => array( 'Jetpack_Sync_Functions', 'site_icon_url' ),
-		'roles'                            => array( 'Jetpack_Sync_Functions', 'roles' ),
-		'default_user_event_tracking'      => array( 'Jetpack_Sync_functions', 'get_default_user_tracking_value' )
+		'roles'                            =>  array( 'Jetpack_Sync_Functions', 'roles' ),
 	);
 
 

diff --git a/sync/class.jetpack-sync-functions.php b/sync/class.jetpack-sync-functions.php
@@ -33,11 +33,6 @@ public static function get_shortcodes() {
 		return array_keys( $shortcode_tags );
 	}
 
-	public static function get_default_user_tracking_value() {
-		jetpack_require_lib(  'class.jetpack-user-event-tracking' );
-		return Jetpack_User_Event_Tracking::default_value();
-	}
-
 	/**
 	 * Removes any callback data since we will not be able to process it on our side anyways.
 	 */

diff --git a/sync/class.jetpack-sync-module-users.php b/sync/class.jetpack-sync-module-users.php
@@ -112,10 +112,7 @@ public function expand_user( $user ) {
 				$user->locale = get_user_locale( $user->ID );
 			}
 		}
-		jetpack_require_lib(  'class.jetpack-user-event-tracking' );
-		if ( Jetpack_User_Event_Tracking::has_value( $user->ID ) ) {
-			$user->jetpack_tracking_enabled = Jetpack_User_Event_Tracking::is_enabled( $user->ID );
-		}
+
 		return $user;
 	}
 
@@ -289,11 +286,6 @@ function maybe_save_user_meta( $meta_id, $user_id, $meta_key, $value ) {
 			$this->add_flags( $user_id, array( 'locale_changed' => true ) );
 		}
 
-		jetpack_require_lib( 'class.jetpack-user-event-tracking' );
-		if ( $meta_key === Jetpack_User_Event_Tracking::$KEY ) {
-			$this->add_flags( $user_id, array( 'tracking_opt_out_changed' => true ) );
-		}
-
 		$user = get_user_by( 'id', $user_id );
 		if ( $meta_key === $user->cap_key  ) {
 			$this->add_flags( $user_id, array( 'capabilities_changed' => true ) );

diff --git a/tests/php.multisite.xml b/tests/php.multisite.xml
@@ -8,14 +8,13 @@
     </php>
     <testsuites>
         <testsuite name="general">
-			<file>php/test_class.jetpack.php</file>
-			<file>php/test_class.functions.compat.php</file>
-			<file>php/test_class.jetpack-network.php</file>
-			<file>php/test_class.jetpack-client-server.php</file>
-			<file>php/test_class.jetpack-xmlrpc-server.php</file>
-			<file>php/test_class.jetpack-heartbeat.php</file>
-			<file>php/test_class.jetpack-user-event-tracking.php</file>
-		</testsuite>
+            <file>php/test_class.jetpack.php</file>
+            <file>php/test_class.functions.compat.php</file>
+            <file>php/test_class.jetpack-network.php</file>
+            <file>php/test_class.jetpack-client-server.php</file>
+            <file>php/test_class.jetpack-xmlrpc-server.php</file>
+            <file>php/test_class.jetpack-heartbeat.php</file>
+        </testsuite>
         <testsuite name="core-api">
             <directory phpVersion="5.6.0" phpVersionOperator=">=" prefix="test_" suffix=".php">tests/php/core-api</directory>
         </testsuite>

diff --git a/tests/php/sync/test_class.jetpack-sync-callables.php b/tests/php/sync/test_class.jetpack-sync-callables.php
@@ -83,7 +83,6 @@ public function test_sync_callable_whitelist() {
 			'site_icon_url'                    => Jetpack_Sync_Functions::site_icon_url(),
 			'shortcodes'                       => Jetpack_Sync_Functions::get_shortcodes(),
 			'roles'                            => Jetpack_Sync_Functions::roles(),
-			'default_user_event_tracking'      => Jetpack_Sync_Functions::get_default_user_tracking_value()
 		);
 
 		if ( function_exists( 'wp_cache_is_enabled' ) ) {

diff --git a/tests/php/test_class.jetpack-user-event-tracking.php b/tests/php/test_class.jetpack-user-event-tracking.php