@@ -134,7 +133,6 @@ import ResourceTable from '../../components/FilesList/ResourceTable.vue'
import { createLocationSpaces } from '../../router'
import { mapActions, mapGetters, mapMutations } from 'vuex'
import AppBar from '../../components/AppBar/AppBar.vue'
-import ProgressBar from '../../components/Upload/ProgressBar.vue'
import CreateAndUpload from '../../components/AppBar/CreateAndUpload.vue'
import ListInfo from '../../components/FilesList/ListInfo.vue'
import Pagination from '../../components/FilesList/Pagination.vue'
@@ -152,7 +150,6 @@ const visibilityObserver = new VisibilityObserver()
export default defineComponent({
components: {
AppBar,
- ProgressBar,
CreateAndUpload,
NoContentMessage,
AppLoadingSpinner,
@@ -193,7 +190,6 @@ export default defineComponent({
...mapGetters('Files', [
'highlightedFile',
'currentFolder',
- 'inProgress',
'totalFilesCount',
'totalFilesSize'
]),
@@ -220,10 +216,6 @@ export default defineComponent({
return this.paginatedResources.length < 1
},
- $_uploadProgressVisible() {
- return this.inProgress.length > 0
- },
-
markdownCollapseIcon() {
return this.markdownCollapsed === true ? 'add' : 'subtract'
},
diff --git a/packages/web-app-files/tests/unit/components/Search/List.spec.js b/packages/web-app-files/tests/unit/components/Search/List.spec.js
index 6bd2c1ead03..e4d879b466b 100644
--- a/packages/web-app-files/tests/unit/components/Search/List.spec.js
+++ b/packages/web-app-files/tests/unit/components/Search/List.spec.js
@@ -130,7 +130,6 @@ function createStore(activeFiles) {
selectedFiles: () => [],
totalFilesCount: () => ({ files: activeFiles.length, folders: 0 }),
totalFilesSize: () => getTotalSize(activeFiles),
- inProgress: () => [],
currentFolder: () => {
return {
path: '',
diff --git a/packages/web-app-files/tests/unit/components/Upload/DetailsWidget.spec.js b/packages/web-app-files/tests/unit/components/Upload/DetailsWidget.spec.js
deleted file mode 100644
index e980c87d053..00000000000
--- a/packages/web-app-files/tests/unit/components/Upload/DetailsWidget.spec.js
+++ /dev/null
@@ -1,59 +0,0 @@
-import { shallowMount, createLocalVue } from '@vue/test-utils'
-import DesignSystem from 'owncloud-design-system'
-
-import DetailsWidget from '@files/src/components/Upload/DetailsWidget.vue'
-
-const selectors = {
- oCProgress: 'oc-progress-stub',
- itemName: '.upload-details-item-name',
- itemSize: '.upload-details-item-size',
- progressText: '.oc-progress-text'
-}
-
-const item = {
- id: 1,
- name: 'lorem.txt',
- size: 100,
- progress: 20
-}
-
-const localVue = createLocalVue()
-localVue.use(DesignSystem)
-
-const wrapper = shallowMount(DetailsWidget, {
- localVue,
- propsData: { items: [item] },
- stubs: {
- 'oc-progress': true,
- 'oc-icon': true
- }
-})
-
-describe('DetailsWidget component', () => {
- describe('when an item is provided in prop', () => {
- it('should have correct props in oc-progress', () => {
- const ocProgress = wrapper.find(selectors.oCProgress)
-
- expect(ocProgress.exists()).toBeTruthy()
- expect(ocProgress.props().value).toBe(item.progress)
- })
- it('should show item name', () => {
- const itemName = wrapper.find(selectors.itemName)
-
- expect(itemName.exists()).toBeTruthy()
- expect(itemName.text()).toEqual(item.name)
- })
- it('should show item size', () => {
- const itemSize = wrapper.find(selectors.itemSize)
-
- expect(itemSize.exists()).toBeTruthy()
- expect(itemSize.text()).toEqual(item.size + ' B')
- })
- it('should show progress percentage', () => {
- const progressText = wrapper.find(selectors.progressText)
-
- expect(progressText.exists()).toBeTruthy()
- expect(progressText.text()).toEqual(item.progress + ' %')
- })
- })
-})
diff --git a/packages/web-app-files/tests/unit/components/Upload/ProgressBar.spec.js b/packages/web-app-files/tests/unit/components/Upload/ProgressBar.spec.js
deleted file mode 100644
index 54812ad1328..00000000000
--- a/packages/web-app-files/tests/unit/components/Upload/ProgressBar.spec.js
+++ /dev/null
@@ -1,167 +0,0 @@
-import { shallowMount, createLocalVue } from '@vue/test-utils'
-import Vuex from 'vuex'
-import DesignSystem from 'owncloud-design-system'
-import GetTextPlugin from 'vue-gettext'
-import ProgressBar from '@files/src/components/Upload/ProgressBar.vue'
-
-const localVue = createLocalVue()
-localVue.use(Vuex)
-localVue.use(DesignSystem)
-localVue.use(GetTextPlugin, {
- translations: 'does-not-matter.json',
- silent: true
-})
-
-const selectors = {
- ocProgress: 'progressbar',
- ocProgressText: '.oc-progress-text',
- ocIcon: 'oc-icon-stub',
- expandedToggle: 'oc-grid-stub',
- progressSingle: '#files-upload-progress-single',
- progressMulti: '#files-upload-progress-multi',
- showDetails: '#files-upload-progress-expand-details',
- hideDetails: '#files-upload-progress-collapse-details',
- detailsWidget: 'details-widget-stub'
-}
-
-const items = [
- {
- id: 1,
- name: 'lorem.txt',
- size: 100,
- progress: 20
- },
- {
- id: 2,
- name: 'lorem.png',
- size: 100,
- progress: 10
- }
-]
-describe('ProgressBar component', () => {
- afterEach(() => {
- jest.clearAllMocks()
- })
- const spyToggleExpanded = jest.spyOn(ProgressBar.methods, '$_toggleExpanded')
-
- describe('when a single file is uploaded', () => {
- let wrapper
- let store
- beforeEach(() => {
- store = createStore([items[0]])
- wrapper = getShallowWrapper(store)
- })
-
- it('should show correct progress value for one file but no file count', () => {
- expect(wrapper).toMatchSnapshot()
- })
- })
-
- describe('when multiple files are uploaded', () => {
- let wrapper
- let store
- beforeEach(() => {
- store = createStore(items)
- wrapper = getShallowWrapper(store)
- })
-
- it('should show total progress value but no file names', () => {
- // explicitly check progress computation as that is hard to verify/miss in snapshot updates
- const ocProgressStub = wrapper.findComponent({ ref: selectors.ocProgress })
- const ocProgressText = wrapper.find(selectors.ocProgressText)
- const totalProgress = items.reduce((total, item) => total + item.progress, 0) / items.length
- expect(ocProgressStub.props().value).toEqual(totalProgress)
- expect(ocProgressText.text()).toBe(`${totalProgress} %`)
-
- expect(wrapper).toMatchSnapshot()
- })
- })
-
- describe('when expanded is false', () => {
- let wrapper
- let store
- beforeEach(() => {
- store = createStore(items)
- wrapper = getShallowWrapper(store)
- })
- it('should have "arrow-down-s" as oc-icon name', () => {
- const ocIcon = wrapper.find(selectors.ocIcon)
-
- expect(ocIcon.props().name).toEqual('arrow-down-s')
- })
- it('should show the text "Show Details"', () => {
- const showDetails = wrapper.find(selectors.showDetails)
- const hideDetails = wrapper.find(selectors.hideDetails)
-
- expect(hideDetails.exists()).toBeFalsy()
- expect(showDetails.exists()).toBeTruthy()
- expect(showDetails.text()).toEqual('Show Details')
- })
- it('should call "$_toggleExpanded" method if expand is toggled', async () => {
- const expandedToggle = wrapper.find(selectors.expandedToggle)
- await expandedToggle.trigger('click')
-
- expect(spyToggleExpanded).toHaveBeenCalledTimes(1)
- })
- it('should not show details-widget component', () => {
- const detailsWidget = wrapper.find(selectors.detailsWidget)
-
- expect(detailsWidget.exists()).toBeFalsy()
- })
- })
-
- describe('when expanded is true', () => {
- let wrapper
- let store
- beforeEach(() => {
- store = createStore(items)
- wrapper = getShallowWrapper(store, true)
- })
- it('should change oc-icon name to "arrow-up-s"', () => {
- const ocIcon = wrapper.find(selectors.ocIcon)
-
- expect(ocIcon.props().name).toEqual('arrow-up-s')
- })
- it('should show the text "Hide Details"', () => {
- const showDetails = wrapper.find(selectors.showDetails)
- const hideDetails = wrapper.find(selectors.hideDetails)
-
- expect(showDetails.exists()).toBeFalsy()
- expect(hideDetails.exists()).toBeTruthy()
- expect(hideDetails.text()).toEqual('Hide Details')
- })
- it('should show details-widget with in-porgress items as prop', () => {
- const detailsWidget = wrapper.find(selectors.detailsWidget)
-
- expect(detailsWidget.exists()).toBeTruthy()
- expect(detailsWidget.props().items).toMatchObject(items)
- })
- })
-})
-
-function getShallowWrapper(store, expanded = false) {
- return shallowMount(ProgressBar, {
- localVue,
- data() {
- return {
- expanded,
- announcement: '',
- announcementOnComplete: 'Upload complete'
- }
- },
- store
- })
-}
-
-function createStore(inProgress = []) {
- return new Vuex.Store({
- modules: {
- Files: {
- namespaced: true,
- getters: {
- inProgress: jest.fn(() => inProgress)
- }
- }
- }
- })
-}
diff --git a/packages/web-app-files/tests/unit/components/Upload/__snapshots__/ProgressBar.spec.js.snap b/packages/web-app-files/tests/unit/components/Upload/__snapshots__/ProgressBar.spec.js.snap
deleted file mode 100644
index 117af18fe25..00000000000
--- a/packages/web-app-files/tests/unit/components/Upload/__snapshots__/ProgressBar.spec.js.snap
+++ /dev/null
@@ -1,49 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`ProgressBar component when a single file is uploaded should show correct progress value for one file but no file count 1`] = `
- =>
}),
{
localVue,
- store: new Vuex.Store({
- modules: {
- Files: {
- state: {
- inProgress: []
- },
- mutations: {
- UPDATE(state, value) {
- state.inProgress = value
- }
- },
- getters: {
- inProgress(state) {
- return state.inProgress
- }
- },
- namespaced: true
- }
- }
- }),
attachTo: document.body
}
)
diff --git a/packages/web-app-files/tests/unit/composables/fileListHeaderPosition/useFileListHeaderPosition.spec.ts b/packages/web-app-files/tests/unit/composables/fileListHeaderPosition/useFileListHeaderPosition.spec.ts
index 6d1502498a0..e657b20c056 100644
--- a/packages/web-app-files/tests/unit/composables/fileListHeaderPosition/useFileListHeaderPosition.spec.ts
+++ b/packages/web-app-files/tests/unit/composables/fileListHeaderPosition/useFileListHeaderPosition.spec.ts
@@ -44,20 +44,4 @@ describe('useFileListHeaderPosition', () => {
wrapper.destroy()
})
-
- it('should calculate y on upload', async () => {
- const wrapper = createWrapper()
- const appBar = createAppBar()
-
- appBar.createElement()
-
- for (const height of [2, 3, 4, 5, 6]) {
- appBar.resize(height)
- wrapper.vm.store.commit('Files/UPDATE', height % 2 === 0 ? [undefined] : [])
- await nextTick()
- expect(wrapper.vm.y).toBe(height)
- }
-
- wrapper.destroy()
- })
})
diff --git a/packages/web-app-files/tests/unit/views/Personal.spec.js b/packages/web-app-files/tests/unit/views/Personal.spec.js
index 7e8ae7f67f7..69db70422bd 100644
--- a/packages/web-app-files/tests/unit/views/Personal.spec.js
+++ b/packages/web-app-files/tests/unit/views/Personal.spec.js
@@ -179,8 +179,7 @@ function createWrapper(selectedFiles = [resourceForestJpg]) {
store: getStore({
selectedFiles: [...selectedFiles],
highlightedFile: resourceForestJpg,
- pages: 4,
- inProgress: [null]
+ pages: 4
}),
localVue,
stubs,
diff --git a/packages/web-app-files/tests/unit/views/spaces/Project.spec.js b/packages/web-app-files/tests/unit/views/spaces/Project.spec.js
index c7b3cdd7e09..65bbccd837c 100644
--- a/packages/web-app-files/tests/unit/views/spaces/Project.spec.js
+++ b/packages/web-app-files/tests/unit/views/spaces/Project.spec.js
@@ -288,8 +288,7 @@ function getMountedWrapper(spaceResources = [], spaceItem = null, imageContent =
selectedFiles: () => [],
totalFilesSize: () => 10,
pages: () => 1,
- currentFileOutgoingCollaborators: () => [spaceShare],
- inProgress: jest.fn(() => [])
+ currentFileOutgoingCollaborators: () => [spaceShare]
}
}
}
diff --git a/packages/web-app-files/tests/unit/views/spaces/__snapshots__/Project.spec.js.snap b/packages/web-app-files/tests/unit/views/spaces/__snapshots__/Project.spec.js.snap
index 1fab80754b6..4c0d9bcffef 100644
--- a/packages/web-app-files/tests/unit/views/spaces/__snapshots__/Project.spec.js.snap
+++ b/packages/web-app-files/tests/unit/views/spaces/__snapshots__/Project.spec.js.snap
@@ -3,7 +3,6 @@
exports[`Spaces project view space image should show if given 1`] = `
@@ -39,7 +38,6 @@ exports[`Spaces project view space image should show if given 1`] = `
exports[`Spaces project view space readme should show if given 1`] = `
(
jest.useFakeTimers()
const store = getStore({
- inProgress: [],
activeFiles: [forestJpg],
totalFilesSize: 0,
totalFilesCount: {
diff --git a/packages/web-runtime/src/container/bootstrap.ts b/packages/web-runtime/src/container/bootstrap.ts
index d5f8717b4ef..d26e31064f9 100644
--- a/packages/web-runtime/src/container/bootstrap.ts
+++ b/packages/web-runtime/src/container/bootstrap.ts
@@ -251,7 +251,7 @@ export const announceClientService = ({
}
/**
- * announce uppyService and owncloud SDK and inject it into vue
+ * announce uppyService and inject it into vue
*
* @param vue
*/
diff --git a/tests/acceptance/expected-failures-with-oc10-server-oauth2-login.md b/tests/acceptance/expected-failures-with-oc10-server-oauth2-login.md
index 48eb5925d5d..5caee570ac9 100644
--- a/tests/acceptance/expected-failures-with-oc10-server-oauth2-login.md
+++ b/tests/acceptance/expected-failures-with-oc10-server-oauth2-login.md
@@ -132,9 +132,9 @@ Other free text and markdown formatting can be used elsewhere in the document if
### [Federated shares not showing in shared with me page](https://github.com/owncloud/web/issues/2510)
- [webUISharingExternalToRoot/federationSharing.feature:32](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingExternalToRoot/federationSharing.feature#L32)
-- [webUISharingExternalToRoot/federationSharing.feature:169](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingExternalToRoot/federationSharing.feature#L169)
+- [webUISharingExternalToRoot/federationSharing.feature:170](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingExternalToRoot/federationSharing.feature#L170)
- [webUISharingExternal/federationSharing.feature:38](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingExternal/federationSharing.feature#L38)
-- [webUISharingExternal/federationSharing.feature:165](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingExternal/federationSharing.feature#L165)
+- [webUISharingExternal/federationSharing.feature:166](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingExternal/federationSharing.feature#L166)
### [browsing directly to a details 'tab' is not possible](https://github.com/owncloud/web/issues/5464)
- [webUIFiles/browseDirectlyToDetailsTab.feature:21](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFiles/browseDirectlyToDetailsTab.feature#L21)
diff --git a/tests/acceptance/features/webUISharingExternal/federationSharing.feature b/tests/acceptance/features/webUISharingExternal/federationSharing.feature
index 0ef307be9f0..7582773ee06 100644
--- a/tests/acceptance/features/webUISharingExternal/federationSharing.feature
+++ b/tests/acceptance/features/webUISharingExternal/federationSharing.feature
@@ -123,7 +123,8 @@ Feature: Federation Sharing - sharing with users on other cloud storages
And the user opens folder "Shares" using the webUI
And the user opens folder "simple-folder" using the webUI
And the user uploads file "new-lorem.txt" using the webUI
- Then as "Alice" file "simple-folder/new-lorem.txt" should exist on remote server
+ Then file "new-lorem.txt" should be listed on the webUI
+ And as "Alice" file "simple-folder/new-lorem.txt" should exist on remote server
@issue-3309
Scenario: rename a file in a received share - remote server shares - local server receives
diff --git a/tests/acceptance/features/webUISharingExternalToRoot/federationSharing.feature b/tests/acceptance/features/webUISharingExternalToRoot/federationSharing.feature
index be39f18572e..fbb652d6e9c 100644
--- a/tests/acceptance/features/webUISharingExternalToRoot/federationSharing.feature
+++ b/tests/acceptance/features/webUISharingExternalToRoot/federationSharing.feature
@@ -127,7 +127,8 @@ Feature: Federation Sharing - sharing with users on other cloud storages
When the user reloads the current page of the webUI
And the user opens folder "simple-folder" using the webUI
And the user uploads file "new-lorem.txt" using the webUI
- Then as "Alice" file "simple-folder/new-lorem.txt" should exist on remote server
+ Then file "new-lorem.txt" should be listed on the webUI
+ And as "Alice" file "simple-folder/new-lorem.txt" should exist on remote server
@issue-3309
Scenario: rename a file in a received share - remote server shares - local server receives
diff --git a/tests/acceptance/pageObjects/personalPage.js b/tests/acceptance/pageObjects/personalPage.js
index 480dd78611c..1b67d535f50 100644
--- a/tests/acceptance/pageObjects/personalPage.js
+++ b/tests/acceptance/pageObjects/personalPage.js
@@ -167,7 +167,6 @@ module.exports = {
this.api.globals.waitForConditionPollInterval,
false
)
- .waitForElementNotVisible('@fileUploadProgress')
.click('@uploadFilesButton')
},
/**
@@ -217,7 +216,6 @@ module.exports = {
this.api.globals.waitForConditionPollInterval,
false
)
- .waitForElementNotVisible('@fileUploadProgress')
.click('@uploadFilesButton')
},
/**
@@ -412,7 +410,7 @@ module.exports = {
selector: '#folderUploadInput'
},
fileUploadProgress: {
- selector: '#files-upload-progress'
+ selector: '#upload-info'
},
dialog: {
selector: '.oc-modal'
-
-
-
-
-
-`;
-
-exports[`ProgressBar component when multiple files are uploaded should show total progress value but no file names 1`] = `
-
- Show Details
-
-
-
-
-
-
-
-`;
diff --git a/packages/web-app-files/tests/unit/components/components.setup.js b/packages/web-app-files/tests/unit/components/components.setup.js
index 7bdab556d02..6461d160980 100644
--- a/packages/web-app-files/tests/unit/components/components.setup.js
+++ b/packages/web-app-files/tests/unit/components/components.setup.js
@@ -61,7 +61,6 @@ export const getStore = function ({
pages = null,
sidebarClosed = false,
currentFolder = null,
- inProgress = [null],
selectedFiles = [],
totalFilesCount = null,
totalFilesSize = null,
@@ -124,7 +123,6 @@ export const getStore = function ({
totalFilesSize: () => totalFilesSize,
selectedFiles: () => selectedFiles,
activeFiles: (state) => state.activeFiles,
- inProgress: () => inProgress,
highlightedFile: () => highlightedFile,
currentFolder: () => currentFolder,
pages: () => pages,
diff --git a/packages/web-app-files/tests/unit/composables/fileListHeaderPosition/spec/index.ts b/packages/web-app-files/tests/unit/composables/fileListHeaderPosition/spec/index.ts
index 11ddaed3a40..4f7ee2ab826 100644
--- a/packages/web-app-files/tests/unit/composables/fileListHeaderPosition/spec/index.ts
+++ b/packages/web-app-files/tests/unit/composables/fileListHeaderPosition/spec/index.ts
@@ -21,26 +21,6 @@ export const createWrapper = (): Wrapper
- Show Details
-
-