Fix behat test failing

Author: BhargavBhandari90

features/user.feature

@@ -379,26 +379,6 @@ Feature: Manage WordPress users
       administrator
       """
 
-  Scenario: Show error when trying to remove capability same as role
-    Given a WP install
-
-    When I run `wp user create testuser2 [email protected] --first_name=test --last_name=user --role=contributor --porcelain`
-    Then STDOUT should be a number
-    And save STDOUT as {USER_ID}
-
-    When I run `wp user list-caps {USER_ID}`
-    Then STDOUT should contain:
-      """
-      contributor
-      """
-
-    When I run `wp user remove-cap {USER_ID} contributor`
-    Then the return code should be 1
-    And STDERR should be:
-      """
-      Error: There is a role similar to 'contributor' capability. Use `wp user remove-role` instead.
-      """
-
   Scenario: Managing user capabilities
     Given a WP install
 
@@ -452,6 +432,33 @@ Feature: Manage WordPress users
       publish_posts
       """
 
+  Scenario: Show error when trying to remove capability same as role
+    Given a WP install
+
+    When I run `wp user create testuser2 [email protected] --first_name=test --last_name=user --role=contributor --porcelain`
+    Then STDOUT should be a number
+    And save STDOUT as {USER_ID}
+
+    When I run `wp user list-caps {USER_ID}`
+    Then STDOUT should contain:
+      """
+      contributor
+      """
+
+    When I run `wp user get {USER_ID} --field=roles`
+    Then STDOUT should contain:
+      """
+      contributor
+      """
+
+    When I try `wp user remove-cap {USER_ID} contributor`
+    Then the return code should be 1
+    And STDERR should be:
+      """
+      Error: There is a role similar to 'contributor' capability. Use `wp user remove-role` instead.
+      """
+    And STDOUT should be empty
+
   Scenario: Show password when creating a user
     Given a WP install
 

src/User_Command.php

@@ -884,8 +884,9 @@ public function remove_cap( $args, $assoc_args ) {
 				}
 				WP_CLI::error( "No such '{$cap}' cap for {$user->user_login} ({$user->ID})." );
 			}
+
 			$user_roles = $user->roles;
-			if ( ! empty( $user_role ) && in_array( $cap, $user_roles, true ) ) {
+			if ( ! empty( $user_roles ) && in_array( $cap, $user_roles, true ) ) {
 				WP_CLI::error( "There is a role similar to '{$cap}' capability. Use `wp user remove-role` instead." );
 			}
 			$user->remove_cap( $cap );