Merge pull request #395 from costdev/link_admin_bar_status_to_api_host_field

Branding: Link admin bar status text to `api_host` field.

Author: namithj

includes/class-branding.php

@@ -137,6 +137,11 @@ public function add_admin_bar_menu( $wp_admin_bar ) {
 			return;
 		}
 
+		$capability = is_multisite() ? 'manage_network' : 'manage_options';
+		if ( ! current_user_can( $capability ) ) {
+			return;
+		}
+
 		$admin_settings = Admin_Settings::get_instance();
 		$options_base   = is_multisite() ? 'settings.php' : 'options-general.php';
 		$settings_page  = network_admin_url( $options_base . '?page=aspireupdate-settings' );
@@ -170,21 +175,18 @@ public function add_admin_bar_menu( $wp_admin_bar ) {
 			[
 				'id'     => 'aspireupdate-admin-bar-menu-status',
 				'parent' => $menu_id,
-				'href'   => false,
+				'href'   => $settings_page . '#aspireupdate-settings-field-api_host',
 				'title'  => sprintf( $status_message, $api_host_name ),
 			]
 		);
 
-		$capability = is_multisite() ? 'manage_network' : 'manage_options';
-		if ( current_user_can( $capability ) ) {
-			$wp_admin_bar->add_menu(
-				[
-					'id'     => 'aspireupdate-admin-bar-menu-settings',
-					'parent' => $menu_id,
-					'href'   => $settings_page,
-					'title'  => __( 'AspireUpdate Settings', 'aspireupdate' ),
-				]
-			);
-		}
+		$wp_admin_bar->add_menu(
+			[
+				'id'     => 'aspireupdate-admin-bar-menu-settings',
+				'parent' => $menu_id,
+				'href'   => $settings_page,
+				'title'  => __( 'AspireUpdate Settings', 'aspireupdate' ),
+			]
+		);
 	}
 }

tests/phpunit/tests/Branding/Branding_AddAdminBarMenuTest.php

@@ -23,6 +23,8 @@ class Branding_AddAdminBarMenuTest extends WP_UnitTestCase {
 	 * Test that the main admin bar menu is added.
 	 */
 	public function test_should_add_main_admin_bar_menu() {
+		$this->set_user_to_administrator();
+
 		$wp_admin_bar = new WP_Admin_Bar();
 		$branding     = new AspireUpdate\Branding();
 
@@ -43,6 +45,8 @@ public function test_should_add_main_admin_bar_menu() {
 	 * Test that the status menu item is added.
 	 */
 	public function test_should_add_status_menu_item() {
+		$this->set_user_to_administrator();
+
 		$wp_admin_bar = new WP_Admin_Bar();
 		$branding     = new AspireUpdate\Branding();
 
@@ -72,9 +76,11 @@ public function test_should_add_status_menu_item() {
 	}
 
 	/**
-	 * Test that the settings link is not added when the user lacks appropriate capabilities.
+	 * Test that the settings link is added.
 	 */
-	public function test_should_not_add_settings_link_when_the_user_lacks_appropriate_capabilities() {
+	public function test_should_add_settings_link() {
+		$this->set_user_to_administrator();
+
 		$wp_admin_bar = new WP_Admin_Bar();
 		$branding     = new AspireUpdate\Branding();
 
@@ -84,24 +90,17 @@ public function test_should_not_add_settings_link_when_the_user_lacks_appropriat
 		$actual = $wp_admin_bar->get_nodes();
 
 		$this->assertIsArray( $actual, 'There are no admin bar nodes.' );
-		$this->assertArrayNotHasKey(
+		$this->assertArrayHasKey(
 			'aspireupdate-admin-bar-menu-settings',
 			$actual,
-			'The settings link is present.'
+			'The settings link is not present.'
 		);
 	}
 
 	/**
-	 * Test that the settings link is added when the user has appropriate capabilities.
+	 * Test that the main admin bar menu is not added when the user lacks appropriate capabilities.
 	 */
-	public function test_should_add_settings_link_when_the_user_has_appropriate_capabilities() {
-		$user = $this->factory->user->create( [ 'role' => 'administrator' ] );
-		wp_set_current_user( $user );
-
-		if ( is_multisite() ) {
-			grant_super_admin( $user );
-		}
-
+	public function test_should_not_add_main_admin_bar_menu_when_the_user_lacks_appropriate_capabilities() {
 		$wp_admin_bar = new WP_Admin_Bar();
 		$branding     = new AspireUpdate\Branding();
 
@@ -110,23 +109,17 @@ public function test_should_add_settings_link_when_the_user_has_appropriate_capa
 
 		$actual = $wp_admin_bar->get_nodes();
 
-		$this->assertIsArray( $actual, 'There are no admin bar nodes.' );
-		$this->assertArrayHasKey(
-			'aspireupdate-admin-bar-menu-settings',
-			$actual,
-			'The settings link is not present.'
-		);
+		$this->assertIsNotArray( $actual, 'There are admin bar nodes.' );
 	}
 
 	/**
-	 * Test that the menu is not added when AP_REMOVE_UI is set to true.
+	 * Test that the main admin bar menu is not added when AP_REMOVE_UI is set to true.
 	 */
-	public function test_should_not_enqueue_style_when_ap_remove_ui_is_true() {
+	public function test_should_not_add_main_admin_bar_menu_when_ap_remove_ui_is_true() {
 		// Prevent the menu from being added.
 		define( 'AP_REMOVE_UI', true );
 
-		$user = $this->factory->user->create( [ 'role' => 'administrator' ] );
-		wp_set_current_user( $user );
+		$this->set_user_to_administrator();
 
 		$wp_admin_bar = new WP_Admin_Bar();
 		$branding     = new AspireUpdate\Branding();
@@ -150,6 +143,8 @@ public function test_should_not_enqueue_style_when_ap_remove_ui_is_true() {
 	public function test_should_set_status_menu_item_content_depending_on_the_api_host_option( $api_host, $expected_name ) {
 		define( 'AP_HOST', $api_host );
 
+		$this->set_user_to_administrator();
+
 		$wp_admin_bar = new WP_Admin_Bar();
 		$branding     = new AspireUpdate\Branding();
 
@@ -205,4 +200,20 @@ public function data_api_hosts_and_expected_names() {
 			],
 		];
 	}
+
+	/**
+	 * Set the current user to an administrator.
+	 *
+	 * Grants super admin privileges when running multisite.
+	 *
+	 * @return void
+	 */
+	private function set_user_to_administrator() {
+		$user = $this->factory->user->create( [ 'role' => 'administrator' ] );
+		wp_set_current_user( $user );
+
+		if ( is_multisite() ) {
+			grant_super_admin( $user );
+		}
+	}
 }