Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40

2 files changed, 82 insertions, 19 deletions

diff --git a/spec/frontend/vue_shared/components/upload_dropzone/__snapshots__/upload_dropzone_spec.js.snap b/spec/frontend/vue_shared/components/upload_dropzone/__snapshots__/upload_dropzone_spec.js.snap
index d2fe3cd76cb..af4fa462cbf 100644
--- a/spec/frontend/vue_shared/components/upload_dropzone/__snapshots__/upload_dropzone_spec.js.snap
+++ b/spec/frontend/vue_shared/components/upload_dropzone/__snapshots__/upload_dropzone_spec.js.snap
@@ -19,6 +19,7 @@ exports[`Upload dropzone component correctly overrides description and drop mess
        
       <p
         class="gl-mb-0"
+        data-testid="upload-text"
       >
         <span>
           Test %{linkStart}description%{linkEnd} message.
@@ -98,10 +99,15 @@ exports[`Upload dropzone component when dragging renders correct template when d
        
       <p
         class="gl-mb-0"
+        data-testid="upload-text"
       >
-        <gl-sprintf-stub
-          message="Drop or %{linkStart}upload%{linkEnd} files to attach"
-        />
+        Drop or 
+        <gl-link-stub>
+          
+                  upload
+                
+        </gl-link-stub>
+         files to attach
       </p>
     </div>
   </button>
@@ -178,10 +184,15 @@ exports[`Upload dropzone component when dragging renders correct template when d
        
       <p
         class="gl-mb-0"
+        data-testid="upload-text"
       >
-        <gl-sprintf-stub
-          message="Drop or %{linkStart}upload%{linkEnd} files to attach"
-        />
+        Drop or 
+        <gl-link-stub>
+          
+                  upload
+                
+        </gl-link-stub>
+         files to attach
       </p>
     </div>
   </button>
@@ -258,10 +269,15 @@ exports[`Upload dropzone component when dragging renders correct template when d
        
       <p
         class="gl-mb-0"
+        data-testid="upload-text"
       >
-        <gl-sprintf-stub
-          message="Drop or %{linkStart}upload%{linkEnd} files to attach"
-        />
+        Drop or 
+        <gl-link-stub>
+          
+                  upload
+                
+        </gl-link-stub>
+         files to attach
       </p>
     </div>
   </button>
@@ -337,10 +353,15 @@ exports[`Upload dropzone component when dragging renders correct template when d
        
       <p
         class="gl-mb-0"
+        data-testid="upload-text"
       >
-        <gl-sprintf-stub
-          message="Drop or %{linkStart}upload%{linkEnd} files to attach"
-        />
+        Drop or 
+        <gl-link-stub>
+          
+                  upload
+                
+        </gl-link-stub>
+         files to attach
       </p>
     </div>
   </button>
@@ -416,10 +437,15 @@ exports[`Upload dropzone component when dragging renders correct template when d
        
       <p
         class="gl-mb-0"
+        data-testid="upload-text"
       >
-        <gl-sprintf-stub
-          message="Drop or %{linkStart}upload%{linkEnd} files to attach"
-        />
+        Drop or 
+        <gl-link-stub>
+          
+                  upload
+                
+        </gl-link-stub>
+         files to attach
       </p>
     </div>
   </button>
@@ -495,10 +521,15 @@ exports[`Upload dropzone component when no slot provided renders default dropzon
        
       <p
         class="gl-mb-0"
+        data-testid="upload-text"
       >
-        <gl-sprintf-stub
-          message="Drop or %{linkStart}upload%{linkEnd} files to attach"
-        />
+        Drop or 
+        <gl-link-stub>
+          
+                  upload
+                
+        </gl-link-stub>
+         files to attach
       </p>
     </div>
   </button>
diff --git a/spec/frontend/vue_shared/components/upload_dropzone/upload_dropzone_spec.js b/spec/frontend/vue_shared/components/upload_dropzone/upload_dropzone_spec.js
index ace486b1f32..b3cdbccb271 100644
--- a/spec/frontend/vue_shared/components/upload_dropzone/upload_dropzone_spec.js
+++ b/spec/frontend/vue_shared/components/upload_dropzone/upload_dropzone_spec.js
@@ -1,4 +1,4 @@
-import { GlIcon } from '@gitlab/ui';
+import { GlIcon, GlSprintf } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 import UploadDropzone from '~/vue_shared/components/upload_dropzone/upload_dropzone.vue';
 
@@ -14,6 +14,7 @@ describe('Upload dropzone component', () => {
   const findDropzoneCard = () => wrapper.find('.upload-dropzone-card');
   const findDropzoneArea = () => wrapper.find('[data-testid="dropzone-area"]');
   const findIcon = () => wrapper.find(GlIcon);
+  const findUploadText = () => wrapper.find('[data-testid="upload-text"]').text();
 
   function createComponent({ slots = {}, data = {}, props = {} } = {}) {
     wrapper = shallowMount(UploadDropzone, {
@@ -22,6 +23,9 @@ describe('Upload dropzone component', () => {
         displayAsCard: true,
         ...props,
       },
+      stubs: {
+        GlSprintf,
+      },
       data() {
         return data;
       },
@@ -30,6 +34,7 @@ describe('Upload dropzone component', () => {
 
   afterEach(() => {
     wrapper.destroy();
+    wrapper = null;
   });
 
   describe('when slot provided', () => {
@@ -60,6 +65,18 @@ describe('Upload dropzone component', () => {
     });
   });
 
+  describe('upload text', () => {
+    it.each`
+      collection    | description                   | props                            | expected
+      ${'multiple'} | ${'by default'}               | ${null}                          | ${'files to attach'}
+      ${'singular'} | ${'when singleFileSelection'} | ${{ singleFileSelection: true }} | ${'file to attach'}
+    `('displays $collection version $description', ({ props, expected }) => {
+      createComponent({ props });
+
+      expect(findUploadText()).toContain(expected);
+    });
+  });
+
   describe('when dragging', () => {
     it.each`
       description                  | eventPayload
@@ -141,6 +158,21 @@ describe('Upload dropzone component', () => {
         wrapper.vm.ondrop(mockEvent);
         expect(wrapper.emitted()).not.toHaveProperty('error');
       });
+
+      describe('singleFileSelection = true', () => {
+        it('emits a single file on drop', () => {
+          createComponent({
+            data: mockData,
+            props: { singleFileSelection: true },
+          });
+
+          const mockFile = { type: 'image/jpg' };
+          const mockEvent = mockDragEvent({ files: [mockFile] });
+
+          wrapper.vm.ondrop(mockEvent);
+          expect(wrapper.emitted().change[0]).toEqual([mockFile]);
+        });
+      });
     });
   });