Merge branch 'smriti_avoid_calling_activity_manager_users_spec' into 'master'

ActivityService should not be called during password update spec

See merge request gitlab-org/gitlab!154343



Merged-by: Smriti Garg <sgarg@gitlab.com>
Approved-by: Manoj M J <mmj@gitlab.com>
Reviewed-by: Manoj M J <mmj@gitlab.com>
Reviewed-by: Abdul Wadood <awadood@gitlab.com>

spec/requests/api/users_spec.rb

@@ -1613,6 +1613,16 @@ def update_password(user, admin, password = User.random_password)
       end
 
       context 'admin updates their own password' do
+        # `Users::ActivityService` should not be allowed to execute
+        # as the same fails on update user_details
+        # This prevents a failure we saw in
+        # https://gitlab.com/gitlab-org/quality/engineering-productivity/master-broken-incidents/-/issues/6616
+        before do
+          allow_next_instance_of(Users::ActivityService) do |service|
+            allow(service).to receive(:execute).and_return(true)
+          end
+        end
+
         it 'does not force reset on next login' do
           update_password(admin, admin)