Commit 9c491bc6 authored by Filipa Lacerda's avatar Filipa Lacerda
Browse files

Merge branch 'ide-multiple-file-uploads' into 'master'

Enabled multiple uploads in the Web IDE

Closes #50405

See merge request gitlab-org/gitlab-ce!21412
parents f2272c15 3a283fa8
Pipeline #12591772 failed with stages
in 0 seconds
......@@ -24,12 +24,6 @@ export default {
default: null,
},
},
mounted() {
this.$refs.fileUpload.addEventListener('change', this.openFile);
},
beforeDestroy() {
this.$refs.fileUpload.removeEventListener('change', this.openFile);
},
methods: {
createFile(target, file, isText) {
const { name } = file;
......@@ -85,6 +79,8 @@ export default {
ref="fileUpload"
type="file"
class="hidden"
multiple
@change="openFile"
/>
</div>
</template>
---
title: Enabled multiple file uploads in the Web IDE
merge_request:
author:
type: added
......@@ -21,6 +21,23 @@ describe('new dropdown upload', () => {
vm.$destroy();
});
 
describe('openFile', () => {
it('calls for each file', () => {
const files = ['test', 'test2', 'test3'];
spyOn(vm, 'readFile');
spyOnProperty(vm.$refs.fileUpload, 'files').and.returnValue(files);
vm.openFile();
expect(vm.readFile.calls.count()).toBe(3);
files.forEach((file, i) => {
expect(vm.readFile.calls.argsFor(i)).toEqual([file]);
});
});
});
describe('readFile', () => {
beforeEach(() => {
spyOn(FileReader.prototype, 'readAsText');
......
Supports Markdown
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