Merge branch 'poffey21-master-patch-66821' into 'master'

Reversed the descriptions of accessibility levels

See merge request gitlab-org/gitlab!60663

app/assets/javascripts/pages/projects/forks/new/components/fork_form.vue

@@ -142,7 +142,9 @@ export default {
           text: s__('ForkProject|Private'),
           value: PRIVATE_VISIBILITY,
           icon: 'lock',
-          help: s__('ForkProject|The project can be accessed without any authentication.'),
+          help: s__(
+            'ForkProject|Project access must be granted explicitly to each user. If this project is part of a group, access will be granted to members of the group.',
+          ),
           disabled: this.isVisibilityLevelDisabled(PRIVATE_VISIBILITY),
         },
         {
@@ -156,9 +158,7 @@ export default {
           text: s__('ForkProject|Public'),
           value: PUBLIC_VISIBILITY,
           icon: 'earth',
-          help: s__(
-            'ForkProject|Project access must be granted explicitly to each user. If this project is part of a group, access will be granted to members of the group.',
-          ),
+          help: s__('ForkProject|The project can be accessed without any authentication.'),
           disabled: this.isVisibilityLevelDisabled(PUBLIC_VISIBILITY),
         },
       ];

spec/frontend/pages/projects/forks/new/components/fork_form_spec.js

-import { GlFormInputGroup, GlFormInput, GlForm } from '@gitlab/ui';
+import { GlFormInputGroup, GlFormInput, GlForm, GlFormRadio } from '@gitlab/ui';
 import { mount, shallowMount } from '@vue/test-utils';
 import axios from 'axios';
 import AxiosMockAdapter from 'axios-mock-adapter';
@@ -15,6 +15,13 @@ describe('ForkForm component', () => {
   let wrapper;
   let axiosMock;
 
+  const PROJECT_VISIBILITY_TYPE = {
+    private:
+      'Private Project access must be granted explicitly to each user. If this project is part of a group, access will be granted to members of the group.',
+    internal: 'Internal The project can be accessed by any logged in user.',
+    public: 'Public The project can be accessed without any authentication.',
+  };
+
   const GON_GITLAB_URL = 'https://gitlab.com';
   const GON_API_VERSION = 'v7';
 
@@ -61,6 +68,7 @@ describe('ForkForm component', () => {
       stubs: {
         GlFormInputGroup,
         GlFormInput,
+        GlFormRadio,
       },
     });
   };
@@ -203,6 +211,24 @@ describe('ForkForm component', () => {
   });
 
   describe('visibility level', () => {
+    it('displays the correct description', () => {
+      mockGetRequest();
+      createComponent();
+
+      const formRadios = wrapper.findAll(GlFormRadio);
+
+      Object.keys(PROJECT_VISIBILITY_TYPE).forEach((visibilityType, index) => {
+        expect(formRadios.at(index).text()).toBe(PROJECT_VISIBILITY_TYPE[visibilityType]);
+      });
+    });
+
+    it('displays all 3 visibility levels', () => {
+      mockGetRequest();
+      createComponent();
+
+      expect(wrapper.findAll(GlFormRadio)).toHaveLength(3);
+    });
+
     it.each`
       project       | namespace     | privateIsDisabled | internalIsDisabled | publicIsDisabled
       ${'private'}  | ${'private'}  | ${undefined}      | ${'true'}          | ${'true'}