Commit 625518e4 authored by Olena Horal-Koretska's avatar Olena Horal-Koretska

Merge branch 'unlock-all-file-types-for-file-repo-uploads' into 'master'

Allow all file types to be uploaded from the repo file upload tool

See merge request gitlab-org/gitlab!57498
parents 55959477 172c6cef
......@@ -168,6 +168,7 @@ export default {
});
},
},
validFileMimetypes: [],
};
</script>
<template>
......@@ -179,7 +180,12 @@ export default {
:action-cancel="cancelOptions"
@primary.prevent="uploadFile"
>
<upload-dropzone class="gl-h-200! gl-mb-4" single-file-selection @change="setFile">
<upload-dropzone
class="gl-h-200! gl-mb-4"
single-file-selection
:valid-file-mimetypes="$options.validFileMimetypes"
@change="setFile"
>
<div
v-if="file"
class="card upload-dropzone-card upload-dropzone-border gl-w-full gl-h-full gl-align-items-center gl-justify-content-center gl-p-3"
......
---
title: Allow all file types to be uploaded from the repo file upload tool
merge_request: 57498
author:
type: fixed
......@@ -19,9 +19,11 @@ RSpec.describe 'Projects > Files > User uploads files' do
wait_for_requests
end
include_examples 'it uploads and commit a new text file'
include_examples 'it uploads and commits a new text file'
include_examples 'it uploads and commit a new image file'
include_examples 'it uploads and commits a new image file'
include_examples 'it uploads and commits a new pdf file'
include_examples 'it uploads a file to a sub-directory'
end
......@@ -33,6 +35,6 @@ RSpec.describe 'Projects > Files > User uploads files' do
visit(project_tree_path(project2))
end
include_examples 'it uploads and commit a new file to a forked project'
include_examples 'it uploads and commits a new file to a forked project'
end
end
......@@ -21,9 +21,11 @@ RSpec.describe 'Projects > Show > User uploads files' do
wait_for_requests
end
include_examples 'it uploads and commit a new text file'
include_examples 'it uploads and commits a new text file'
include_examples 'it uploads and commit a new image file'
include_examples 'it uploads and commits a new image file'
include_examples 'it uploads and commits a new pdf file'
include_examples 'it uploads a file to a sub-directory'
end
......@@ -35,7 +37,7 @@ RSpec.describe 'Projects > Show > User uploads files' do
visit(project_path(project2))
end
include_examples 'it uploads and commit a new file to a forked project'
include_examples 'it uploads and commits a new file to a forked project'
end
context 'when in the empty_repo_upload experiment' do
......
# frozen_string_literal: true
RSpec.shared_examples 'it uploads and commit a new text file' do
it 'uploads and commit a new text file', :js do
RSpec.shared_examples 'it uploads and commits a new text file' do
it 'uploads and commits a new text file', :js do
find('.add-to-tree').click
page.within('.dropdown-menu') do
......@@ -32,8 +32,8 @@ RSpec.shared_examples 'it uploads and commit a new text file' do
end
end
RSpec.shared_examples 'it uploads and commit a new image file' do
it 'uploads and commit a new image file', :js do
RSpec.shared_examples 'it uploads and commits a new image file' do
it 'uploads and commits a new image file', :js do
find('.add-to-tree').click
page.within('.dropdown-menu') do
......@@ -58,13 +58,39 @@ RSpec.shared_examples 'it uploads and commit a new image file' do
end
end
RSpec.shared_examples 'it uploads and commit a new file to a forked project' do
RSpec.shared_examples 'it uploads and commits a new pdf file' do
it 'uploads and commits a new pdf file', :js do
find('.add-to-tree').click
page.within('.dropdown-menu') do
click_link('Upload file')
wait_for_requests
end
attach_file('upload_file', File.join(Rails.root, 'spec', 'fixtures', 'git-cheat-sheet.pdf'), make_visible: true)
page.within('#modal-upload-blob') do
fill_in(:commit_message, with: 'New commit message')
fill_in(:branch_name, with: 'upload_image', visible: true)
click_button('Upload file')
end
wait_for_all_requests
visit(project_blob_path(project, 'upload_image/git-cheat-sheet.pdf'))
expect(page).to have_css('.js-pdf-viewer')
end
end
RSpec.shared_examples 'it uploads and commits a new file to a forked project' do
let(:fork_message) do
"You're not allowed to make changes to this project directly. "\
"A fork of this project has been created that you can make changes in, so you can submit a merge request."
end
it 'uploads and commit a new file to a forked project', :js, :sidekiq_might_not_need_inline do
it 'uploads and commits a new file to a forked project', :js, :sidekiq_might_not_need_inline do
find('.add-to-tree').click
click_link('Upload file')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment