Update tests

Author: simison

projects/packages/admin-ui/src/class-admin-menu.php

@@ -49,6 +49,13 @@ class Admin_Menu {
 	 */
 	private static $menu_items = array();
 
+	/**
+	 * Optional connection manager dependency.
+	 *
+	 * @var object|null
+	 */
+	private static $connection_manager = null;
+
 	/**
 	 * Initialize the class and set up the main hook
 	 *
@@ -287,13 +294,28 @@ private static function should_show_upgrade_menu() {
 	 * @return bool True if the site has a connected blog ID.
 	 */
 	private static function is_site_connected() {
-		if ( class_exists( '\Automattic\Jetpack\Connection\Manager' ) ) {
-			return (bool) ( new \Automattic\Jetpack\Connection\Manager() )->is_connected();
+		$connection_manager = self::$connection_manager;
+		if ( ! $connection_manager && class_exists( '\Automattic\Jetpack\Connection\Manager' ) ) {
+			$connection_manager = new \Automattic\Jetpack\Connection\Manager();
+		}
+
+		if ( $connection_manager && is_callable( array( $connection_manager, 'is_connected' ) ) ) {
+			return (bool) $connection_manager->is_connected();
 		}
 
 		return false;
 	}
 
+	/**
+	 * Sets the connection manager dependency.
+	 *
+	 * @param object|null $connection_manager Connection manager object.
+	 * @return void
+	 */
+	public static function set_connection_manager( $connection_manager ) {
+		self::$connection_manager = $connection_manager;
+	}
+
 	/**
 	 * Checks whether the current site is on a free Jetpack plan with no active paid license.
 	 *

projects/packages/admin-ui/tests/php/Admin_Menu_Test.php

@@ -92,6 +92,11 @@ public function setUp(): void {
 		delete_option( 'jetpack_active_plan' );
 		delete_option( 'jetpack_site_products' );
 		update_option( 'jetpack_options', array( 'id' => 123456 ) );
+		$connection = $this->getMockBuilder( 'Automattic\Jetpack\Connection\Manager' )
+			->disableOriginalConstructor()
+			->getMock();
+		$connection->method( 'is_connected' )->willReturn( true );
+		Admin_Menu::set_connection_manager( $connection );
 		wp_dequeue_style( 'jetpack-admin-ui-upgrade-menu' );
 		wp_deregister_style( 'jetpack-admin-ui-upgrade-menu' );
 		wp_dequeue_script( 'jetpack-admin-ui-upgrade-menu' );
@@ -208,6 +213,13 @@ public function test_first_menu() {
 	 */
 	public function test_upgrade_menu_item_shown_for_free_plan_admin() {
 		wp_set_current_user( self::$admin_user_id );
+		$connection = $this->getMockBuilder( 'Automattic\Jetpack\Connection\Manager' )
+			->disableOriginalConstructor()
+			->getMock();
+		$connection->expects( $this->once() )
+			->method( 'is_connected' )
+			->willReturn( true );
+		Admin_Menu::set_connection_manager( $connection );
 
 		Admin_Menu::init();
 		do_action( 'admin_menu' );
@@ -373,7 +385,13 @@ public function test_upgrade_menu_item_hidden_for_non_admin() {
 	 */
 	public function test_upgrade_menu_item_hidden_when_site_not_connected() {
 		wp_set_current_user( self::$admin_user_id );
-		update_option( 'jetpack_options', array() );
+		$connection = $this->getMockBuilder( 'Automattic\Jetpack\Connection\Manager' )
+			->disableOriginalConstructor()
+			->getMock();
+		$connection->expects( $this->once() )
+			->method( 'is_connected' )
+			->willReturn( false );
+		Admin_Menu::set_connection_manager( $connection );
 
 		Admin_Menu::init();
 		do_action( 'admin_menu' );

projects/packages/admin-ui/tests/php/bootstrap.php

@@ -10,8 +10,12 @@
  */
 require_once __DIR__ . '/../../vendor/autoload.php';
 
+if ( ! class_exists( 'Jetpack_Options' ) ) {
+	require_once __DIR__ . '/../../../connection/legacy/class-jetpack-options.php';
+}
+
 if ( ! class_exists( '\Automattic\Jetpack\Connection\Manager' ) ) {
-	require_once __DIR__ . '/stubs/class-manager.php';
+	require_once __DIR__ . '/../../../connection/src/class-manager.php';
 }
 
 define( 'WP_DEBUG', true );