Merge pull request #7646 from google/deprecated-emoji-tests

tests/e2e/config/wordpress-debug-log/log-ignore-list.js

@@ -19,4 +19,11 @@ export const logIgnoreList = {
 		'PHP Notice:  Trying to access array offset on value of type null in /var/www/html/wp-includes/rest-api/class-wp-rest-request.php on line 337',
 		'PHP Notice:  Trying to access array offset on value of type bool in /var/www/html/wp-includes/theme.php on line 2360',
 	],
+	nightly: [
+		// Can be removed once WordPress AMP Plugin removes the deprecated function
+		// call.
+		//
+		// See: https://github.com/ampproject/amp-wp/issues/7619
+		'PHP Deprecated:  Function _admin_bar_bump_cb is deprecated since version 6.4.0! Use wp_enqueue_admin_bar_bump_styles instead. in /var/www/html/wp-includes/functions.php on line 6032',
+	],
 };

tests/phpunit/integration/Modules/AnalyticsTest.php

@@ -479,9 +479,10 @@ public function test_tracking_disabled( $settings, $logged_in, $is_tracking_acti
 		wp_scripts()->queue      = array();
 		wp_scripts()->done       = array();
 		wp_styles(); // Prevent potential ->queue of non-object error.
-		remove_all_actions( 'wp_enqueue_scripts' );
+
 		// Remove irrelevant script from throwing errors in CI from readfile().
 		remove_action( 'wp_head', 'print_emoji_detection_script', 7 );
+
 		// Set the current user (can be 0 for no user)
 		$role = $is_content_creator ? 'administrator' : 'subscriber';
 		$user = $logged_in ?