Skip to content

Commit

Permalink
Fix file and folder upload postprocessing
Browse files Browse the repository at this point in the history
  • Loading branch information
kulmann authored and pascalwengerter committed Feb 24, 2022
1 parent 33100c3 commit 11c3a4f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
12 changes: 6 additions & 6 deletions packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
Original file line number Diff line number Diff line change
Expand Up @@ -210,14 +210,14 @@ export default {
...mapActions(['openFile', 'showMessage', 'createModal', 'setModalInputErrorMessage']),
...mapMutations('Files', ['UPSERT_RESOURCE']),
uploadSuccess() {
this.$emit('success')
uploadSuccess(args, file) {
this.$emit('success', args, file)
},
uploadError() {
this.$emit('error')
uploadError(error) {
this.$emit('error', error)
},
uploadProgress() {
this.$emit('progress')
uploadProgress(progress) {
this.$emit('progress', progress)
},
showCreateResourceModal(
Expand Down
6 changes: 3 additions & 3 deletions tests/acceptance/pageObjects/personalPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,8 @@ module.exports = {
* @param {string} folderName
*/
uploadFolder: function (folderName) {
return this.waitForElementVisible('@newFileMenuButton')
.click('@newFileMenuButton')
return this.waitForElementVisible('@uploadFilesButton')
.click('@uploadFilesButton')
.waitForElementVisible('@fileUploadButton')
.setValue('@folderUploadInput', folderName)
.waitForElementVisible(
Expand All @@ -193,7 +193,7 @@ module.exports = {
false
)
.waitForElementNotVisible('@fileUploadProgress')
.click('@newFileMenuButton')
.click('@uploadFilesButton')
},
/**
* Returns whether files or folders can be created in the current page.
Expand Down

0 comments on commit 11c3a4f

Please sign in to comment.