Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42

1 files changed, 15 insertions, 0 deletions

diff --git a/qa/qa/resource/user.rb b/qa/qa/resource/user.rb
index ed4ea057484..eab428a61e7 100644
--- a/qa/qa/resource/user.rb
+++ b/qa/qa/resource/user.rb
@@ -98,6 +98,12 @@ module QA
         super
       end
 
+      def exists?
+        api_get
+      rescue ResourceNotFoundError
+        false
+      end
+
       def api_delete
         super
 
@@ -181,6 +187,15 @@ module QA
         )
       end
 
+      protected
+
+      # Compare users by username and password
+      #
+      # @return [Array]
+      def comparable
+        [username, password]
+      end
+
       private
 
       def ldap_post_body