Add latest changes from gitlab-org/gitlab@master

1 files changed, 21 insertions, 17 deletions

diff --git a/spec/frontend/snippets/components/edit_spec.js b/spec/frontend/snippets/components/edit_spec.js
index f49ceb2fede..cf897414ccb 100644
--- a/spec/frontend/snippets/components/edit_spec.js
+++ b/spec/frontend/snippets/components/edit_spec.js
@@ -16,10 +16,10 @@ import SnippetBlobActionsEdit from '~/snippets/components/snippet_blob_actions_e
 import SnippetDescriptionEdit from '~/snippets/components/snippet_description_edit.vue';
 import SnippetVisibilityEdit from '~/snippets/components/snippet_visibility_edit.vue';
 import {
-  SNIPPET_VISIBILITY_PRIVATE,
-  SNIPPET_VISIBILITY_INTERNAL,
-  SNIPPET_VISIBILITY_PUBLIC,
-} from '~/snippets/constants';
+  VISIBILITY_LEVEL_PRIVATE_STRING,
+  VISIBILITY_LEVEL_INTERNAL_STRING,
+  VISIBILITY_LEVEL_PUBLIC_STRING,
+} from '~/visibility_level/constants';
 import CreateSnippetMutation from '~/snippets/mutations/create_snippet.mutation.graphql';
 import UpdateSnippetMutation from '~/snippets/mutations/update_snippet.mutation.graphql';
 import FormFooterActions from '~/vue_shared/components/form/form_footer_actions.vue';
@@ -41,7 +41,7 @@ const TEST_SNIPPET_GID = 'gid://gitlab/PersonalSnippet/42';
 const createSnippet = () =>
   merge(createGQLSnippet(), {
     webUrl: TEST_WEB_URL,
-    visibilityLevel: SNIPPET_VISIBILITY_PRIVATE,
+    visibilityLevel: VISIBILITY_LEVEL_PRIVATE_STRING,
   });
 
 const createQueryResponse = (obj = {}) =>
@@ -70,7 +70,7 @@ const getApiData = ({
   id,
   title = '',
   description = '',
-  visibilityLevel = SNIPPET_VISIBILITY_PRIVATE,
+  visibilityLevel = VISIBILITY_LEVEL_PRIVATE_STRING,
 } = {}) => ({
   id,
   title,
@@ -128,7 +128,10 @@ describe('Snippet Edit app', () => {
   const setDescription = (val) =>
     wrapper.findComponent(SnippetDescriptionEdit).vm.$emit('input', val);
 
-  const createComponent = ({ props = {}, selectedLevel = SNIPPET_VISIBILITY_PRIVATE } = {}) => {
+  const createComponent = ({
+    props = {},
+    selectedLevel = VISIBILITY_LEVEL_PRIVATE_STRING,
+  } = {}) => {
     if (wrapper) {
       throw new Error('wrapper already created');
     }
@@ -260,17 +263,18 @@ describe('Snippet Edit app', () => {
       },
     );
 
-    it.each([SNIPPET_VISIBILITY_PRIVATE, SNIPPET_VISIBILITY_INTERNAL, SNIPPET_VISIBILITY_PUBLIC])(
-      'marks %s visibility by default',
-      async (visibility) => {
-        createComponent({
-          props: { snippetGid: '' },
-          selectedLevel: visibility,
-        });
+    it.each([
+      VISIBILITY_LEVEL_PRIVATE_STRING,
+      VISIBILITY_LEVEL_INTERNAL_STRING,
+      VISIBILITY_LEVEL_PUBLIC_STRING,
+    ])('marks %s visibility by default', async (visibility) => {
+      createComponent({
+        props: { snippetGid: '' },
+        selectedLevel: visibility,
+      });
 
-        expect(wrapper.find(SnippetVisibilityEdit).props('value')).toBe(visibility);
-      },
-    );
+      expect(wrapper.find(SnippetVisibilityEdit).props('value')).toBe(visibility);
+    });
 
     describe('form submission handling', () => {
       describe('when creating a new snippet', () => {