Add latest changes from gitlab-org/gitlab@master

1 files changed, 25 insertions, 0 deletions

diff --git a/spec/features/projects/files/user_uploads_files_spec.rb b/spec/features/projects/files/user_uploads_files_spec.rb
index 8a20c1387a3..ecf40969541 100644
--- a/spec/features/projects/files/user_uploads_files_spec.rb
+++ b/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