From ccab6fb4df8bc12220334618e56d911c4d0e447c Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Fri, 31 Mar 2023 15:08:50 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 spec/frontend/lib/utils/error_message_spec.js | 35 +++++++++++++++------------
 1 file changed, 20 insertions(+), 15 deletions(-)

(limited to 'spec/frontend/lib')

diff --git a/spec/frontend/lib/utils/error_message_spec.js b/spec/frontend/lib/utils/error_message_spec.js
index 54c630b8ba0..d55a6de06c3 100644
--- a/spec/frontend/lib/utils/error_message_spec.js
+++ b/spec/frontend/lib/utils/error_message_spec.js
@@ -1,4 +1,4 @@
-import { parseErrorMessage, USER_FACING_ERROR_MESSAGE_PREFIX } from '~/lib/utils/error_message';
+import { parseErrorMessage } from '~/lib/utils/error_message';
 
 const defaultErrorMessage = 'Default error message';
 const errorMessage = 'Returned error message';
@@ -10,13 +10,18 @@ const generateErrorWithMessage = (message) => {
 };
 
 describe('parseErrorMessage', () => {
+  const ufErrorPrefix = 'Foo:';
+  beforeEach(() => {
+    gon.uf_error_prefix = ufErrorPrefix;
+  });
+
   it.each`
-    error                                                    | expectedResult
-    ${`${USER_FACING_ERROR_MESSAGE_PREFIX} ${errorMessage}`} | ${errorMessage}
-    ${`${errorMessage} ${USER_FACING_ERROR_MESSAGE_PREFIX}`} | ${defaultErrorMessage}
-    ${errorMessage}                                          | ${defaultErrorMessage}
-    ${undefined}                                             | ${defaultErrorMessage}
-    ${''}                                                    | ${defaultErrorMessage}
+    error                                 | expectedResult
+    ${`${ufErrorPrefix} ${errorMessage}`} | ${errorMessage}
+    ${`${errorMessage} ${ufErrorPrefix}`} | ${defaultErrorMessage}
+    ${errorMessage}                       | ${defaultErrorMessage}
+    ${undefined}                          | ${defaultErrorMessage}
+    ${''}                                 | ${defaultErrorMessage}
   `(
     'properly parses "$error" error object and returns "$expectedResult"',
     ({ error, expectedResult }) => {
@@ -26,14 +31,14 @@ describe('parseErrorMessage', () => {
   );
 
   it.each`
-    error                                                                              | defaultMessage         | expectedResult
-    ${undefined}                                                                       | ${defaultErrorMessage} | ${defaultErrorMessage}
-    ${''}                                                                              | ${defaultErrorMessage} | ${defaultErrorMessage}
-    ${{}}                                                                              | ${defaultErrorMessage} | ${defaultErrorMessage}
-    ${generateErrorWithMessage(errorMessage)}                                          | ${undefined}           | ${''}
-    ${generateErrorWithMessage(`${USER_FACING_ERROR_MESSAGE_PREFIX} ${errorMessage}`)} | ${undefined}           | ${errorMessage}
-    ${generateErrorWithMessage(errorMessage)}                                          | ${''}                  | ${''}
-    ${generateErrorWithMessage(`${USER_FACING_ERROR_MESSAGE_PREFIX} ${errorMessage}`)} | ${''}                  | ${errorMessage}
+    error                                                           | defaultMessage         | expectedResult
+    ${undefined}                                                    | ${defaultErrorMessage} | ${defaultErrorMessage}
+    ${''}                                                           | ${defaultErrorMessage} | ${defaultErrorMessage}
+    ${{}}                                                           | ${defaultErrorMessage} | ${defaultErrorMessage}
+    ${generateErrorWithMessage(errorMessage)}                       | ${undefined}           | ${''}
+    ${generateErrorWithMessage(`${ufErrorPrefix} ${errorMessage}`)} | ${undefined}           | ${errorMessage}
+    ${generateErrorWithMessage(errorMessage)}                       | ${''}                  | ${''}
+    ${generateErrorWithMessage(`${ufErrorPrefix} ${errorMessage}`)} | ${''}                  | ${errorMessage}
   `(
     'properly handles the edge case of error="$error" and defaultMessage="$defaultMessage"',
     ({ error, defaultMessage, expectedResult }) => {
-- 
cgit v1.2.3