Merge branch 'ph/212642/userUploadsFile' into 'master'

Fixed upload file not uploading to the correct directory

Closes #212642

See merge request gitlab-org/gitlab!28533

app/assets/javascripts/blob/blob_file_dropzone.js

@@ -43,6 +43,10 @@ export default class BlobFileDropzone {
       previewsContainer: '.dropzone-previews',
       headers: csrf.headers,
       init() {
+        this.on('processing', function() {
+          this.options.url = form.attr('action');
+        });
+
         this.on('addedfile', () => {
           toggleLoading(submitButton, submitButtonLoadingIcon, false);
           dropzoneMessage.addClass(HIDDEN_CLASS);

changelogs/unreleased/ph-212642-userUploadsFile.yml

+---
+title: Fixed upload file creating a file in the wrong directory
+merge_request:
+author:
+type: fixed

spec/features/projects/files/user_uploads_files_spec.rb

@@ -22,6 +22,31 @@ describe 'Projects > Files > User uploads files' do
     include_examples 'it uploads and commit a new text file'
 
     include_examples 'it uploads and commit a new image file'
+
+    it 'uploads a file to a sub-directory', :js do
+      click_link 'files'
+
+      page.within('.repo-breadcrumb') do
+        expect(page).to have_content('files')
+      end
+
+      find('.add-to-tree').click
+      click_link('Upload file')
+      drop_in_dropzone(File.join(Rails.root, 'spec', 'fixtures', 'doc_sample.txt'))
+
+      page.within('#modal-upload-blob') do
+        fill_in(:commit_message, with: 'New commit message')
+      end
+
+      click_button('Upload file')
+
+      expect(page).to have_content('New commit message')
+
+      page.within('.repo-breadcrumb') do
+        expect(page).to have_content('files')
+        expect(page).to have_content('doc_sample.txt')
+      end
+    end
   end
 
   context 'when a user does not have write access' do