Fix hook logic and tests

Author: schlessera

features/super-admin.feature

@@ -254,16 +254,7 @@ Feature: Manage super admins associated with a multisite instance
       """
 
     When I run `wp user create superadmin superadmin@example.com`
-    Then STDOUT should contain:
-      """
-      grant_super_admin hook was fired.
-      """
-    And STDOUT should contain:
-      """
-      granted_super_admin hook was fired.
-      """
-
-    When I run `wp super-admin add superadmin`
+    And I run `wp super-admin add superadmin`
     Then STDOUT should contain:
       """
       grant_super_admin hook was fired.
@@ -294,7 +285,7 @@ Feature: Manage super admins associated with a multisite instance
       """
 
     When I try `wp super-admin add noadmin`
-    Then STDOUT should contain:
+    Then STDOUT should not contain:
       """
       grant_super_admin hook was fired.
       """
@@ -314,7 +305,7 @@ Feature: Manage super admins associated with a multisite instance
       """
 
     When I try `wp super-admin remove noadmin`
-    Then STDOUT should contain:
+    Then STDOUT should not contain:
       """
       revoke_super_admin hook was fired.
       """

src/Super_Admin_Command.php

@@ -160,11 +160,6 @@ public function add( $args, $_ ) {
 	 *     Success: Revoked super-admin capabilities.
 	 */
 	public function remove( $args, $_ ) {
-		$super_admins = self::get_admins();
-		if ( ! $super_admins ) {
-			WP_CLI::error( 'No super admins to revoke super-admin privileges from.' );
-		}
-
 		$users             = $this->fetcher->get_many( $args );
 		$user_logins       = $users ? array_values( array_unique( wp_list_pluck( $users, 'user_login' ) ) ) : [];
 		$user_logins_count = count( $user_logins );
@@ -176,6 +171,11 @@ public function remove( $args, $_ ) {
 			do_action( 'revoke_super_admin', (int) $user->ID ); // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound
 		}
 
+		$super_admins = self::get_admins();
+		if ( ! $super_admins ) {
+			WP_CLI::error( 'No super admins to revoke super-admin privileges from.' );
+		}
+
 		if ( $user_logins_count < count( $args ) ) {
 			$flipped_user_logins = array_flip( $user_logins );
 			// Fetcher has already warned so don't bother here, but continue with any args that are possible login names to cater for invalid users in the site options meta.