diff --git a/__fixtures__/sidebarNavItems.js b/__fixtures__/sidebarNavItems.js index 45bf14b9fcf..0a99dc26593 100644 --- a/__fixtures__/sidebarNavItems.js +++ b/__fixtures__/sidebarNavItems.js @@ -1,6 +1,6 @@ export default [ { - name: "All files", + name: "Personal", icon: "folder", route: { name: "files-personal", @@ -9,32 +9,14 @@ export default [ active: true }, { - name: "Shared with me", - icon: "shared-with-me", + name: "Shares", + icon: 'share-forward', route: { name: "files-shared-with-me", path: "/files/list/shared-with-me" }, active: false }, - { - name: "Shared with others", - icon: "shared-with-others", - route: { - name: "files-shared-with-others", - path: "/files/list/shared-with-others" - }, - active: false - }, - { - name: "Shared via link", - icon: "link", - route: { - name: "files-shared-via-link", - path: "/files/list/shared-via-link" - }, - active: false - }, { name: "Deleted files", icon: "delete", diff --git a/changelog/unreleased/enhancement-shares-overview b/changelog/unreleased/enhancement-shares-overview index e89d42f142a..59d4ead7a5f 100644 --- a/changelog/unreleased/enhancement-shares-overview +++ b/changelog/unreleased/enhancement-shares-overview @@ -2,6 +2,8 @@ Enhancement: Shares overview We've merged the three shares navigation items into one central "Shares" item, with a toggle to switch between the three different kinds of shares (incoming, outgoing, links). +In the process, we have also renamed the "All files" page to the "Personal" page, indicating that +this is the user's personal space since shares (and potentially other shared spaces) live elsewhere. https://github.com/owncloud/web/issues/6440 https://github.com/owncloud/web/pull/6512 diff --git a/packages/web-app-files/src/components/AppBar/AppBar.vue b/packages/web-app-files/src/components/AppBar/AppBar.vue index 85afe99c980..c498e9f5756 100644 --- a/packages/web-app-files/src/components/AppBar/AppBar.vue +++ b/packages/web-app-files/src/components/AppBar/AppBar.vue @@ -196,7 +196,7 @@ export default { if (acc.length) { if (this.isPersonalLocation) { - acc[0].text = this.$gettext('All files') + acc[0].text = this.$gettext('Personal') acc[0].to = acc[0].to + '/' } else if (this.isSpacesProjectLocation || this.isSpacesProjectsLocation) { acc[0] = { diff --git a/packages/web-app-files/src/components/FilesList/NotFoundMessage.vue b/packages/web-app-files/src/components/FilesList/NotFoundMessage.vue index 262fcf761eb..06d9fb37394 100644 --- a/packages/web-app-files/src/components/FilesList/NotFoundMessage.vue +++ b/packages/web-app-files/src/components/FilesList/NotFoundMessage.vue @@ -29,7 +29,7 @@ appearance="raw" :to="homeRoute" > - Go to »All files« + Go to »Personal« page [ component: components.Personal, meta: { hasBulkActions: true, - title: $gettext('All files'), + title: $gettext('Personal'), patchCleanPath: true } } diff --git a/packages/web-app-files/src/views/LocationPicker.vue b/packages/web-app-files/src/views/LocationPicker.vue index 88eccc90eec..f3951cbca8a 100644 --- a/packages/web-app-files/src/views/LocationPicker.vue +++ b/packages/web-app-files/src/views/LocationPicker.vue @@ -216,7 +216,7 @@ export default { this.currentAction === batchActions.move ? this.$gettext('Move into »%{ target }«') : this.$gettext('Copy into »%{ target }«') - const target = basename(this.target) || this.$gettext('All files') + const target = basename(this.target) || this.$gettext('Personal') return this.$gettextInterpolate(translated, { target }) }, @@ -259,7 +259,7 @@ export default { breadcrumbs.push(this.createBreadcrumbNode(i + 1, pathSegments[i], itemPath)) } } else { - breadcrumbs.push(this.createBreadcrumbNode(0, this.$gettext('All files'), '/')) + breadcrumbs.push(this.createBreadcrumbNode(0, this.$gettext('Personal'), '/')) for (let i = 0; i < pathSegments.length; i++) { const itemPath = join.apply(null, pathSegments.slice(0, i + 1)) breadcrumbs.push(this.createBreadcrumbNode(i + 1, pathSegments[i], itemPath)) diff --git a/packages/web-app-files/tests/unit/components/FilesList/NotFoundMessage.spec.js b/packages/web-app-files/tests/unit/components/FilesList/NotFoundMessage.spec.js index 9bc7deae13a..e0355abd432 100644 --- a/packages/web-app-files/tests/unit/components/FilesList/NotFoundMessage.spec.js +++ b/packages/web-app-files/tests/unit/components/FilesList/NotFoundMessage.spec.js @@ -35,7 +35,7 @@ describe('NotFoundMessage', () => { expect(homeButton.exists()).toBeTruthy() expect(homeButton.find('translate-stub')).toBeTruthy() - expect(homeButton.find('translate-stub').text()).toBe('Go to »All files«') + expect(homeButton.find('translate-stub').text()).toBe('Go to »Personal« page') }) it('should not show reload public link button', () => { diff --git a/packages/web-app-files/tests/unit/views/LocationPicker.spec.js b/packages/web-app-files/tests/unit/views/LocationPicker.spec.js index 9dea5c6fb35..477b4c72d3f 100644 --- a/packages/web-app-files/tests/unit/views/LocationPicker.spec.js +++ b/packages/web-app-files/tests/unit/views/LocationPicker.spec.js @@ -131,7 +131,7 @@ describe('LocationPicker', () => { expect(breadcrumbItems.length).toBe(3) expect(breadcrumbItems[0]).toMatchObject({ index: 0, - text: 'All files', + text: 'Personal', to: { name: route.name, params: { action: route.params.action, item: '/' }, diff --git a/packages/web-app-files/tests/unit/views/__snapshots__/LocationPicker.spec.js.snap b/packages/web-app-files/tests/unit/views/__snapshots__/LocationPicker.spec.js.snap index 44b15646ad6..be660eafb4a 100644 --- a/packages/web-app-files/tests/unit/views/__snapshots__/LocationPicker.spec.js.snap +++ b/packages/web-app-files/tests/unit/views/__snapshots__/LocationPicker.spec.js.snap @@ -14,9 +14,9 @@ exports[`LocationPicker files app bar should show current hint according to the Resources will be moved into the folder where you are currently located.

`; -exports[`LocationPicker files app bar should show location picker selection info according to route action and item 1`] = `

Move into »All files«

`; +exports[`LocationPicker files app bar should show location picker selection info according to route action and item 1`] = `

Move into »Personal«

`; -exports[`LocationPicker files app bar should show location picker selection info according to route action and item 2`] = `

Copy into »All files«

`; +exports[`LocationPicker files app bar should show location picker selection info according to route action and item 2`] = `

Copy into »Personal«

`; exports[`LocationPicker files app bar should show location picker selection info according to route action and item 3`] = `

Move into »child«

`; diff --git a/packages/web-runtime/src/components/Topbar/TopBar.vue b/packages/web-runtime/src/components/Topbar/TopBar.vue index fb0945979f6..3a82943c082 100644 --- a/packages/web-runtime/src/components/Topbar/TopBar.vue +++ b/packages/web-runtime/src/components/Topbar/TopBar.vue @@ -72,7 +72,7 @@ export default { }, sidebarLogoAlt() { - return this.$gettext('Navigate to all files page') + return this.$gettext('Navigate to personal files page') }, logoImage() { diff --git a/packages/web-runtime/tests/unit/components/SidebarNav/__snapshots__/SidebarNav.spec.js.snap b/packages/web-runtime/tests/unit/components/SidebarNav/__snapshots__/SidebarNav.spec.js.snap index 0576feb48ba..5791d2b1dd2 100644 --- a/packages/web-runtime/tests/unit/components/SidebarNav/__snapshots__/SidebarNav.spec.js.snap +++ b/packages/web-runtime/tests/unit/components/SidebarNav/__snapshots__/SidebarNav.spec.js.snap @@ -6,11 +6,9 @@ exports[`OcSidebarNav renders navItems into a list 1`] = ` Footer @@ -22,11 +20,9 @@ exports[`OcSidebarNav toggles back into open state upon button click 1`] = ` Footer @@ -38,11 +34,9 @@ exports[`OcSidebarNav toggles into closed state upon button click 1`] = ` Footer diff --git a/packages/web-runtime/tests/unit/components/SidebarNav/__snapshots__/SidebarNavItem.spec.js.snap b/packages/web-runtime/tests/unit/components/SidebarNav/__snapshots__/SidebarNavItem.spec.js.snap index 50cc410d2fe..9ac75da2f61 100644 --- a/packages/web-runtime/tests/unit/components/SidebarNav/__snapshots__/SidebarNavItem.spec.js.snap +++ b/packages/web-runtime/tests/unit/components/SidebarNav/__snapshots__/SidebarNavItem.spec.js.snap @@ -2,7 +2,7 @@ exports[`OcSidebarNav renders navItem with toolTip if collapsed 1`] = `
  • - All files + Personal
    • @@ -10,7 +10,7 @@ exports[`OcSidebarNav renders navItem with toolTip if collapsed 1`] = ` exports[`OcSidebarNav renders navItem without toolTip if expanded 1`] = `
  • - All files + Personal
    • diff --git a/packages/web-runtime/tests/unit/components/Topbar/__snapshots__/TopBar.spec.js.snap b/packages/web-runtime/tests/unit/components/Topbar/__snapshots__/TopBar.spec.js.snap index 9d4bc8d2548..a82c7697d76 100644 --- a/packages/web-runtime/tests/unit/components/Topbar/__snapshots__/TopBar.spec.js.snap +++ b/packages/web-runtime/tests/unit/components/Topbar/__snapshots__/TopBar.spec.js.snap @@ -5,7 +5,7 @@ exports[`Top Bar component Displays applications menu 1`] = `
    - +
    diff --git a/tests/acceptance/features/webUICreateFilesFolders/createFile.feature b/tests/acceptance/features/webUICreateFilesFolders/createFile.feature index 07d41dc5001..adf74f50ada 100644 --- a/tests/acceptance/features/webUICreateFilesFolders/createFile.feature +++ b/tests/acceptance/features/webUICreateFilesFolders/createFile.feature @@ -7,7 +7,7 @@ Feature: create files Given user "Alice" has been created with default attributes and without skeleton files in the server And user "Alice" has created file "/lorem.txt" in the server And user "Alice" has logged in using the webUI - And the user has browsed to the files page + And the user has browsed to the personal page @ocisSmokeTest Scenario: create a new file diff --git a/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature b/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature index 281306d597e..1d808207d3d 100644 --- a/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature +++ b/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature @@ -78,7 +78,7 @@ Feature: deleting files and folders Given user "Alice" has uploaded file "data.zip" to "data.zip" in the server And user "Alice" has created file "lorem.txt" in the server And user "Alice" has created folder "simple-folder" in the server - And the user has browsed to the files page + And the user has browsed to the personal page When the user marks all files for batch action using the webUI # Shares is a special folder that cannot be deleted on oCIS # The user has to unmark it in order to "delete all" the rest of the items @@ -253,7 +253,7 @@ Feature: deleting files and folders Scenario: Try to delete file and folder that used to exist but does not anymore Given user "Alice" has created folder "simple-folder" in the server And user "Alice" has created file "lorem.txt" in the server - And the user has browsed to the files page + And the user has browsed to the personal page And the following files have been deleted by user "Alice" in the server | name | | lorem.txt | diff --git a/tests/acceptance/features/webUIFavorites/favoritesFile.feature b/tests/acceptance/features/webUIFavorites/favoritesFile.feature index 7b05aef921f..8e2dd537552 100644 --- a/tests/acceptance/features/webUIFavorites/favoritesFile.feature +++ b/tests/acceptance/features/webUIFavorites/favoritesFile.feature @@ -8,7 +8,7 @@ Feature: Mark file as favorite Background: Given user "Alice" has been created with default attributes and without skeleton files in the server And user "Alice" has logged in using the webUI - And the user has browsed to the files page + And the user has browsed to the personal page @smokeTest Scenario: mark files as favorites @@ -111,7 +111,7 @@ Feature: Mark file as favorite Scenario: Try to favorite file and folder that used to exist but does not anymore Given user "Alice" has created file "lorem.txt" in the server And user "Alice" has created folder "simple-folder" in the server - And the user has browsed to the files page + And the user has browsed to the personal page And the following files have been deleted by user "Alice" in the server | name | | lorem.txt | diff --git a/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature b/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature index 2d0cab3737a..8c75cc30a83 100644 --- a/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature +++ b/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature @@ -18,7 +18,7 @@ Feature: Unmark file/folder as favorite And user "Alice" has favorited element "data.zip" in the server And user "Alice" has favorited element "data.tar.gz" in the server And user "Alice" has favorited element "lorem.txt" in the server - And the user has browsed to the files page + And the user has browsed to the personal page When the user unmarks the favorited file "data.zip" using the webUI Then as user "Alice" file "data.zip" should not be marked as favorite in the server And file "data.zip" should not be marked as favorite on the webUI @@ -39,7 +39,7 @@ Feature: Unmark file/folder as favorite And user "Alice" has favorited element "simple-folder" in the server And user "Alice" has favorited element "simple-empty-folder" in the server And user "Alice" has favorited element "0" in the server - And the user has browsed to the files page + And the user has browsed to the personal page When the user unmarks the favorited folder "simple-folder" using the webUI Then as user "Alice" folder "simple-folder" should not be marked as favorite in the server And folder "simple-folder" should not be marked as favorite on the webUI @@ -107,7 +107,7 @@ Feature: Unmark file/folder as favorite And the user has reloaded the current page of the webUI And user "Alice" has favorited element "simple-folder" in the server And user "Alice" has favorited element "lorem.txt" in the server - And the user has browsed to the files page + And the user has browsed to the personal page And the following files have been deleted by user "Alice" in the server | name | | lorem.txt | diff --git a/tests/acceptance/features/webUIFiles/batchAction.feature b/tests/acceptance/features/webUIFiles/batchAction.feature index 478fd174081..a3f26178168 100644 --- a/tests/acceptance/features/webUIFiles/batchAction.feature +++ b/tests/acceptance/features/webUIFiles/batchAction.feature @@ -11,7 +11,7 @@ Feature: Visibility of the batch actions menu And user "Alice" has created folder "simple-folder" in the server - Scenario: View batch action menu for a folder on the all files page + Scenario: View batch action menu for a folder on the personal page Given user "Alice" has logged in using the webUI When the user marks the folder "simple-folder" using the webUI Then the following batch action buttons should be visible @@ -21,7 +21,7 @@ Feature: Visibility of the batch actions menu | Delete | - Scenario: View batch action menu for a file on the all files page + Scenario: View batch action menu for a file on the personal page Given user "Alice" has created file "lorem.txt" in the server And user "Alice" has logged in using the webUI When the user marks the file "lorem.txt" using the webUI @@ -33,7 +33,7 @@ Feature: Visibility of the batch actions menu | Copy | - Scenario: View batch action menu when selecting both file and folder on the all files page + Scenario: View batch action menu when selecting both file and folder on the personal page Given user "Alice" has created file "lorem.txt" in the server And user "Alice" has logged in using the webUI When the user marks these files for batch action using the webUI @@ -99,7 +99,7 @@ Feature: Visibility of the batch actions menu Scenario: View batch action menu for a folder on the shared via link page Given user "Alice" has created a public link with following settings in the server - | path | /simple-folder | + | path | /simple-folder | And user "Alice" has logged in using the webUI And the user has browsed to the shared-via-link page When the user marks the folder "simple-folder" using the webUI diff --git a/tests/acceptance/features/webUIFilesActionMenu/fileFolderActionMenu.feature b/tests/acceptance/features/webUIFilesActionMenu/fileFolderActionMenu.feature index 2e648453ab3..2bd667c63c0 100644 --- a/tests/acceptance/features/webUIFilesActionMenu/fileFolderActionMenu.feature +++ b/tests/acceptance/features/webUIFilesActionMenu/fileFolderActionMenu.feature @@ -3,13 +3,13 @@ Feature: User can see the file or folder actions menu options I want to be able to see the actions menu options of file or folder So that the menu options of the selected file type or folder are visible to me -Background: prepare user and files + Background: prepare user and files Given user "Alice" has been created with default attributes and without skeleton files in the server And user "Alice" has created folder "simple-folder" in the server And user "Alice" has uploaded file "lorem.txt" to "lorem.txt" in the server And user "Alice" has uploaded file "testavatar.png" to "testavatar.png" in the server And user "Alice" has logged in using the webUI - And the user has browsed to the files page + And the user has browsed to the personal page Scenario: observe different actions menu options on selecting different file types Given user "Alice" has uploaded file with content "pdf file" to "lorem.pdf" in the server @@ -17,35 +17,35 @@ Background: prepare user and files When the user opens the actions sidebar panel of file "lorem.txt" on the webUI Then the app-sidebar for file "lorem.txt" should be visible on the webUI And only the following items with default items should be visible in the actions menu on the webUI - | items | - | open in markdowneditor | - | download | + | items | + | open in markdowneditor | + | download | When the user opens the actions sidebar panel of file "lorem.pdf" on the webUI Then the app-sidebar for file "lorem.pdf" should be visible on the webUI And only the following items with default items should be visible in the actions menu on the webUI - | items | - | open in browser | - | download | + | items | + | open in browser | + | download | When the user opens the actions sidebar panel of file "testavatar.png" on the webUI Then the app-sidebar for file "testavatar.png" should be visible on the webUI And only the following items with default items should be visible in the actions menu on the webUI - | items | - | open in mediaviewer | - | download | + | items | + | open in mediaviewer | + | download | @skipOnOC10 Scenario: observe different actions menu options on selecting a folder When the user opens the actions sidebar panel of folder "simple-folder" on the webUI Then the app-sidebar for folder "simple-folder" should be visible on the webUI And only the following items with default items should be visible in the actions menu on the webUI - | items | - | open folder | - | download | + | items | + | open folder | + | download | @skipOnOCIS Scenario: observe different actions menu options on selecting a folder When the user opens the actions sidebar panel of folder "simple-folder" on the webUI Then the app-sidebar for folder "simple-folder" should be visible on the webUI And only the following items with default items should be visible in the actions menu on the webUI - | items | - | open folder | + | items | + | open folder | diff --git a/tests/acceptance/features/webUIFilesActionMenu/versions.feature b/tests/acceptance/features/webUIFilesActionMenu/versions.feature index 3e722856283..0887a089830 100644 --- a/tests/acceptance/features/webUIFilesActionMenu/versions.feature +++ b/tests/acceptance/features/webUIFilesActionMenu/versions.feature @@ -15,7 +15,7 @@ Feature: Versions of a file Scenario: upload new file with same name to see if different versions are shown Given user "user0" has logged in using the webUI And user "user0" has uploaded file "lorem.txt" to "lorem.txt" in the server - And the user has browsed to the files page + And the user has browsed to the personal page And user "user0" has uploaded file with content "lorem content" to "lorem.txt" in the server And user "user0" has uploaded file with content "new lorem content" to "lorem.txt" in the server When the user browses to display the "versions" details of file "lorem.txt" @@ -27,7 +27,7 @@ Feature: Versions of a file Given user "user0" has uploaded file with content "lorem content" to "lorem-file.txt" in the server And user "user0" has uploaded file with content "new lorem content" to "lorem-file.txt" in the server And user "user0" has logged in using the webUI - And the user has browsed to the files page + And the user has browsed to the personal page When the user browses to display the "versions" details of file "lorem-file.txt" And the user restores the file to last version using the webUI Then the content of file "lorem-file.txt" for user "user0" should be "lorem content" in the server diff --git a/tests/acceptance/features/webUIFilesCopy/copy.feature b/tests/acceptance/features/webUIFilesCopy/copy.feature index c6636c0dc54..fa7c0046f35 100644 --- a/tests/acceptance/features/webUIFilesCopy/copy.feature +++ b/tests/acceptance/features/webUIFilesCopy/copy.feature @@ -30,7 +30,7 @@ Feature: copy files and folders And user "Alice" has created folder "strängé नेपाली folder" in the server And user "Alice" has created file "strängé नेपाली folder/strängé filename (duplicate #2 &).txt" in the server And user "Alice" has logged in using the webUI - And the user has browsed to the files page + And the user has browsed to the personal page When the user tries to copy file "strängé filename (duplicate #2 &).txt" into folder "strängé नेपाली folder" using the webUI Then the error message with header 'Failed to copy "strängé filename (duplicate #2 &).txt"' should be displayed on the webUI @@ -59,7 +59,7 @@ Feature: copy files and folders Given user "Alice" has uploaded file "lorem.txt" to "lorem.txt" in the server And user "Alice" has created folder "simple-empty-folder" in the server And user "Alice" has logged in using the webUI - And the user has browsed to the files page + And the user has browsed to the personal page When the user renames file "lorem.txt" to using the webUI And the user renames folder "simple-empty-folder" to using the webUI And the user copies file into folder using the webUI @@ -132,7 +132,7 @@ Feature: copy files and folders Given user "Alice" has uploaded file "data.zip" to "data.zip" in the server And user "Alice" has created folder "simple-empty-folder" in the server And user "Alice" has logged in using the webUI - And the user has browsed to the files page + And the user has browsed to the personal page When the user selects copy action for folder "data.zip" using the webUI And the user selects the folder "simple-empty-folder" as a place to copy the file using the webUI And the user cancels the attempt to copy resources using the webUI @@ -145,7 +145,7 @@ Feature: copy files and folders And user "Alice" has created file "lorem.txt" in the server And user "Alice" has created folder "simple-empty-folder" in the server And user "Alice" has logged in using the webUI - And the user has browsed to the files page + And the user has browsed to the personal page When the user marks these files for batch action using the webUI | file_name | | data.zip | diff --git a/tests/acceptance/features/webUIFilesCopy/copyPrivateLinks.feature b/tests/acceptance/features/webUIFilesCopy/copyPrivateLinks.feature index 1ecbdb4f6da..db29b63acfa 100644 --- a/tests/acceptance/features/webUIFilesCopy/copyPrivateLinks.feature +++ b/tests/acceptance/features/webUIFilesCopy/copyPrivateLinks.feature @@ -9,7 +9,7 @@ Feature: copy path as a permanent link And user "Alice" has created folder "simple-folder" in the server And user "Alice" has created file "lorem.txt" in the server And user "Alice" has logged in using the webUI - And the user has browsed to the files page + And the user has browsed to the personal page Scenario Outline: Copy permalink to clipboard diff --git a/tests/acceptance/features/webUIFilesDetails/fileDetails.feature b/tests/acceptance/features/webUIFilesDetails/fileDetails.feature index b0febe7f17f..c98d139529e 100644 --- a/tests/acceptance/features/webUIFilesDetails/fileDetails.feature +++ b/tests/acceptance/features/webUIFilesDetails/fileDetails.feature @@ -13,7 +13,7 @@ Feature: User can open the details panel for any file or folder @files_versions-app-required Scenario: View different areas of the app-sidebar for a file in files page Given user "Alice" has created file "lorem.txt" in the server - And the user has browsed to the files page + And the user has browsed to the personal page When the user opens the sidebar for file "lorem.txt" on the webUI Then the app-sidebar should be visible And the thumbnail should be visible in the app-sidebar @@ -26,7 +26,7 @@ Feature: User can open the details panel for any file or folder @files_versions-app-required Scenario: View different areas of the app-sidebar for a folder in files page Given user "Alice" has created folder "simple-folder" in the server - And the user has browsed to the files page + And the user has browsed to the personal page When the user opens the sidebar for folder "simple-folder" on the webUI Then the app-sidebar should be visible And the thumbnail should be visible in the app-sidebar @@ -41,7 +41,7 @@ Feature: User can open the details panel for any file or folder @files_versions-app-required @ocis-reva-issue-39 Scenario: View different areas of the app-sidebar for a file in favorites page Given user "Alice" has created file "lorem.txt" in the server - And the user has browsed to the files page + And the user has browsed to the personal page And user "Alice" has favorited element "lorem.txt" in the server And the user has browsed to the favorites page When the user opens the sidebar for file "lorem.txt" on the webUI @@ -56,7 +56,7 @@ Feature: User can open the details panel for any file or folder @files_versions-app-required @ocis-reva-issue-39 Scenario: View different areas of the app-sidebar for a folder in favorites page Given user "Alice" has created folder "simple-folder" in the server - And the user has browsed to the files page + And the user has browsed to the personal page And user "Alice" has favorited element "simple-folder" in the server And the user has browsed to the favorites page When the user opens the sidebar for folder "simple-folder" on the webUI @@ -73,9 +73,9 @@ Feature: User can open the details panel for any file or folder @issue-1158 @comments-app-required @public_link_share-feature-required Scenario: user shares a file through public link and then the details dialog should work in a Shared by link page Given user "Alice" has created folder "simple-folder" in the server - And the user has browsed to the files page + And the user has browsed to the personal page And user "Alice" has created a public link with following settings in the server - | path | simple-folder | + | path | simple-folder | And the user has browsed to the shared-via-link page When the user opens the actions sidebar panel of file "simple-folder" on the webUI Then the thumbnail should be visible in the app-sidebar @@ -89,7 +89,7 @@ Feature: User can open the details panel for any file or folder @issue-1158 @comments-app-required Scenario: user shares a file and then the details dialog should work in a Shared with others page Given user "Alice" has created folder "simple-folder" in the server - And the user has browsed to the files page + And the user has browsed to the personal page And user "Alice" has shared folder "simple-folder" with user "Brian" in the server When the user browses to the shared-with-others page Then folder "simple-folder" should be listed on the webUI @@ -106,7 +106,7 @@ Feature: User can open the details panel for any file or folder @issue-1158 @comments-app-required Scenario: user shares a folder via link and then the details dialog should work in a Shared with others page Given user "Alice" has created folder "simple-folder" in the server - And the user has browsed to the files page + And the user has browsed to the personal page And user "Alice" has created a new public link for resource "simple-folder" in the server When the user browses to the shared-with-others page Then folder "simple-folder" should be listed on the webUI @@ -123,7 +123,7 @@ Feature: User can open the details panel for any file or folder @issue-1158 @comments-app-required Scenario: the recipient user should be able to view different areas of details panel in Shared with me page Given user "Alice" has created folder "simple-folder" in the server - And the user has browsed to the files page + And the user has browsed to the personal page And user "Alice" has shared folder "simple-folder" with user "Brian" in the server And the user re-logs in as "Brian" using the webUI When the user browses to the shared-with-me page @@ -152,7 +152,7 @@ Feature: User can open the details panel for any file or folder @issue-1158 @issue-5017 @comments-app-required Scenario: View different areas of details panel for the folder with given tag in Tags page Given user "Alice" has created folder "simple-folder" in the server - And the user has browsed to the files page + And the user has browsed to the personal page Given user "Alice" has created a "normal" tag with name "simple" And user "Alice" has added tag "simple" to folder "simple-folder" When the user browses to the tags page @@ -172,7 +172,7 @@ Feature: User can open the details panel for any file or folder Scenario: the sidebar is invisible after closing Given user "Alice" has created file "lorem.txt" in the server - And the user has browsed to the files page + And the user has browsed to the personal page When the user opens the sidebar for file "lorem.txt" on the webUI Then the app-sidebar should be visible When the user closes the app-sidebar using the webUI @@ -181,6 +181,6 @@ Feature: User can open the details panel for any file or folder @issue-4244 Scenario: the sidebar is invisible after opening the selected folder Given user "Alice" has created file "simple-folder" in the server - And the user has browsed to the files page + And the user has browsed to the personal page When the user opens folder "simple-folder" using the webUI Then the app-sidebar should be invisible diff --git a/tests/acceptance/features/webUIFilesList/sort.feature b/tests/acceptance/features/webUIFilesList/sort.feature index 046411da086..5a98a09e2cb 100644 --- a/tests/acceptance/features/webUIFilesList/sort.feature +++ b/tests/acceptance/features/webUIFilesList/sort.feature @@ -9,31 +9,31 @@ Feature: Sort files/folders And user "Alice" has logged in using the webUI And user "Alice" has created folder "test_sort" in the server And user "Alice" has created the following folders in the server - | entry_name | - | test_sort/a | + | entry_name | + | test_sort/a | | test_sort/a 文件 | - | test_sort/10 | - | test_sort/1 | - | test_sort/2 | - | test_sort/z | + | test_sort/10 | + | test_sort/1 | + | test_sort/2 | + | test_sort/z | And user "Alice" has created the following files in the server | entry_name | | test_sort/a.txt | | test_sort/a space.txt | | test_sort/a space (2).txt | - | test_sort/a space 文件 | - | test_sort/a space 文件夹 | + | test_sort/a space 文件 | + | test_sort/a space 文件夹 | | test_sort/b1.txt | | test_sort/b2.txt | | test_sort/b10.txt | | test_sort/z.txt | Scenario: Folders are listed before files alphabetically by default and sorted using natural sort - When the user has browsed to the files page + When the user has browsed to the personal page Then these resources should be listed in the folder "test_sort" on the webUI | entry_name | | a | - | a 文件 | + | a 文件 | | 1 | | 2 | | 10 | @@ -41,15 +41,15 @@ Feature: Sort files/folders | a.txt | | a space.txt | | a space (2).txt | - | a space 文件 | - | a space 文件夹 | + | a space 文件 | + | a space 文件夹 | | b1.txt | | b2.txt | | b10.txt | | z.txt | Scenario: Resources can be sorted in reverse alphabetical order - When the user has browsed to the files page + When the user has browsed to the personal page And the user has set the sort order of the "Name" column to descending order Then these resources should be listed in the folder "test_sort" on the webUI | entry_name | @@ -57,8 +57,8 @@ Feature: Sort files/folders | b10.txt | | b2.txt | | b1.txt | - | a space 文件夹 | - | a space 文件 | + | a space 文件夹 | + | a space 文件 | | a space (2).txt | | a space.txt | | a.txt | @@ -66,16 +66,16 @@ Feature: Sort files/folders | 10 | | 2 | | 1 | - | a 文件 | + | a 文件 | | a | Scenario: Resources can be sorted by updated time - When the user has browsed to the files page + When the user has browsed to the personal page And the user has set the sort order of the "Modified" column to ascending order Then these resources should be listed in the folder "test_sort" on the webUI | entry_name | | a | - | a 文件 | + | a 文件 | | 10 | | 1 | | 2 | diff --git a/tests/acceptance/features/webUILogin/adminBlocksUser.feature b/tests/acceptance/features/webUILogin/adminBlocksUser.feature index 8f2dedd37fc..804d9500aa1 100644 --- a/tests/acceptance/features/webUILogin/adminBlocksUser.feature +++ b/tests/acceptance/features/webUILogin/adminBlocksUser.feature @@ -6,7 +6,7 @@ Feature: view profile Background: Given user "Alice" has been created with default attributes and without skeleton files in the server And user "Alice" has logged in using the webUI - And the user has browsed to the files page + And the user has browsed to the personal page And user "Alice" has been blocked by admin in the server @openIdLogin diff --git a/tests/acceptance/features/webUILogin/oauthLogin.feature b/tests/acceptance/features/webUILogin/oauthLogin.feature index e73694162f9..e592526bca5 100644 --- a/tests/acceptance/features/webUILogin/oauthLogin.feature +++ b/tests/acceptance/features/webUILogin/oauthLogin.feature @@ -21,7 +21,7 @@ Feature: login users Scenario: logging out Given user "Alice" has logged in using the webUI - And the user has browsed to the files page + And the user has browsed to the personal page When the user logs out of the webUI Then the user should be redirected to the IdP login page @@ -40,7 +40,7 @@ Feature: login users Scenario: the user session of a deleted user is cleared properly Given user "Alice" has logged in using the webUI - And the user has browsed to the files page + And the user has browsed to the personal page And user "Alice" has been deleted in the server When the user reloads the current page of the webUI Then the user should be redirected to the owncloud login page diff --git a/tests/acceptance/features/webUILogin/openidLogin.feature b/tests/acceptance/features/webUILogin/openidLogin.feature index 6761dbce134..6ae8febd88f 100644 --- a/tests/acceptance/features/webUILogin/openidLogin.feature +++ b/tests/acceptance/features/webUILogin/openidLogin.feature @@ -21,14 +21,14 @@ Feature: login users Scenario: logging out Given user "Alice" has logged in using the webUI - And the user has browsed to the files page + And the user has browsed to the personal page When the user logs out of the webUI Then the user should be redirected to the IdP login page @ocisSmokeTest Scenario: logging out redirects to the url with state attribute Given user "Alice" has logged in using the webUI - And the user has browsed to the files page + And the user has browsed to the personal page When the user logs out of the webUI Then the user should be on page with the url containing "state=" When user "Alice" logs in using the webUI @@ -49,7 +49,7 @@ Feature: login users Scenario: the user session of a deleted user is cleared properly Given user "Alice" has logged in using the webUI - And the user has browsed to the files page + And the user has browsed to the personal page And user "Alice" has been deleted in the server When the user reloads the current page of the webUI Then the user should be redirected to the login error page diff --git a/tests/acceptance/features/webUIMarkdownEditor/markdownFile.feature b/tests/acceptance/features/webUIMarkdownEditor/markdownFile.feature index aecbb3efc28..209730c6cdd 100644 --- a/tests/acceptance/features/webUIMarkdownEditor/markdownFile.feature +++ b/tests/acceptance/features/webUIMarkdownEditor/markdownFile.feature @@ -7,7 +7,7 @@ Feature: create markdown files Given user "Alice" has been created with default attributes and without skeleton files in the server And user "Alice" has uploaded file with content "simple markdown file" to "simple.md" in the server And user "Alice" has logged in using the webUI - And the user has browsed to the files page + And the user has browsed to the personal page @disablePreviews Scenario: create a new markdown file in the root directory @@ -66,9 +66,9 @@ Feature: create markdown files When the user opens file "" in the markdown editor using the action menu option on the webUI Then the file "" should be displayed in the markdown editor webUI Examples: - | file | - | simple.md | - | lorem.txt | + | file | + | simple.md | + | lorem.txt | @disablePreviews Scenario Outline: Previewing text writen in markdown format @@ -76,9 +76,9 @@ Feature: create markdown files When the user inputs the content "" in the markdown editor webUI Then the preview panel should have "" element with text "" Examples: - | content | innertext | tagname | - | `code` | code | p > code | - | # heading | heading | h1 | - | ###### heading | heading | h6 | - | - list1 | list1 | ul > li | - | [link]() | link | p > a | + | content | innertext | tagname | + | `code` | code | p > code | + | # heading | heading | h1 | + | ###### heading | heading | h6 | + | - list1 | list1 | ul > li | + | [link]() | link | p > a | diff --git a/tests/acceptance/features/webUIMoveFilesFolders/moveFiles.feature b/tests/acceptance/features/webUIMoveFilesFolders/moveFiles.feature index ec57f987686..8a523d6f137 100644 --- a/tests/acceptance/features/webUIMoveFilesFolders/moveFiles.feature +++ b/tests/acceptance/features/webUIMoveFilesFolders/moveFiles.feature @@ -11,7 +11,7 @@ Feature: move files Scenario: An attempt to move a file into a sub-folder using rename is not allowed Given user "Alice" has logged in using the webUI - And the user has browsed to the files page + And the user has browsed to the personal page When the user tries to rename file "lorem.txt" to "simple-folder/lorem.txt" using the webUI Then the error message 'The name cannot contain "/"' should be displayed on the webUI dialog prompt And file "lorem.txt" should be listed on the webUI @@ -43,11 +43,11 @@ Feature: move files Scenario: move a file into a folder where a file with the same name already exists Given user "Alice" has logged in using the webUI And user "Alice" has uploaded file "lorem.txt" to "simple-folder/lorem.txt" in the server - And the user has browsed to the files page + And the user has browsed to the personal page When the user tries to move file "lorem.txt" into folder "simple-folder" using the webUI Then the error message with header 'Failed to move "lorem.txt"' should be displayed on the webUI - @smokeTest @ocisSmokeTest @disablePreviews + @smokeTest @ocisSmokeTest @disablePreviews Scenario: Move multiple files at once Given user "Alice" has logged in using the webUI And user "Alice" has uploaded file "data.zip" to "data.zip" in the server @@ -68,7 +68,7 @@ Feature: move files Scenario Outline: move a file into a folder (problematic characters) Given user "Alice" has logged in using the webUI - And the user has browsed to the files page + And the user has browsed to the personal page When the user renames file "lorem.txt" to using the webUI And the user renames folder "simple-folder" to using the webUI And the user moves file into folder using the webUI @@ -104,7 +104,7 @@ Feature: move files Scenario: cancel moving a file Given user "Alice" has logged in using the webUI - And the user has browsed to the files page + And the user has browsed to the personal page And the user selects move action for file "lorem.txt" using the webUI And the user selects the folder "simple-folder" as a place to move the file using the webUI And the user cancels the attempt to move resources using the webUI @@ -115,7 +115,7 @@ Feature: move files Given user "Alice" has logged in using the webUI And user "Alice" has uploaded file "data.zip" to "data.zip" in the server And user "Alice" has uploaded file "data.zip" to "testapp.zip" in the server - And the user has browsed to the files page + And the user has browsed to the personal page When the user marks these files for batch action using the webUI | file_name | | data.zip | diff --git a/tests/acceptance/features/webUIMoveFilesFolders/moveFolders.feature b/tests/acceptance/features/webUIMoveFilesFolders/moveFolders.feature index 9f745201cca..081b7acb650 100644 --- a/tests/acceptance/features/webUIMoveFilesFolders/moveFolders.feature +++ b/tests/acceptance/features/webUIMoveFilesFolders/moveFolders.feature @@ -11,7 +11,7 @@ Feature: move folders Scenario: An attempt to move a folder into a sub-folder using rename is not allowed Given user "Alice" has logged in using the webUI - And the user has browsed to the files page + And the user has browsed to the personal page When the user tries to rename folder "simple-empty-folder" to "simple-folder/simple-empty-folder" using the webUI Then the error message 'The name cannot contain "/"' should be displayed on the webUI dialog prompt And folder "simple-empty-folder" should be listed on the webUI @@ -33,7 +33,7 @@ Feature: move folders Scenario: move a folder into another folder where a folder with the same name already exists Given user "Alice" has created folder "simple-folder/simple-empty-folder" in the server And user "Alice" has logged in using the webUI - And the user has browsed to the files page + And the user has browsed to the personal page When the user tries to move folder "simple-empty-folder" into folder "simple-folder" using the webUI Then the error message with header 'Failed to move "simple-empty-folder"' should be displayed on the webUI @@ -55,7 +55,7 @@ Feature: move folders Scenario Outline: move a folder into another folder (problematic characters) Given user "Alice" has logged in using the webUI - And the user has browsed to the files page + And the user has browsed to the personal page When the user renames folder "simple-folder" to using the webUI And the user renames folder "simple-empty-folder" to using the webUI And the user moves folder into folder using the webUI diff --git a/tests/acceptance/features/webUIRenameFiles/renameFiles.feature b/tests/acceptance/features/webUIRenameFiles/renameFiles.feature index ac371fed935..e3bf63d0029 100644 --- a/tests/acceptance/features/webUIRenameFiles/renameFiles.feature +++ b/tests/acceptance/features/webUIRenameFiles/renameFiles.feature @@ -131,9 +131,9 @@ Feature: rename files Then the error message 'The name cannot contain "/"' should be displayed on the webUI dialog prompt And file "" should be listed on the webUI Examples: - | from_file_name | to_file_name | - | lorem.txt | simple-folder/lorem.txt | - | lorem.txt | lorem/txt | + | from_file_name | to_file_name | + | lorem.txt | simple-folder/lorem.txt | + | lorem.txt | lorem/txt | @@ -255,7 +255,7 @@ Feature: rename files Scenario: User tries to rename a file that used to exist but does not anymore - Given the user has browsed to the files page + Given the user has browsed to the personal page And the following files have been deleted by user "Alice" in the server | name | | lorem.txt | diff --git a/tests/acceptance/features/webUIRenameFolders/renameFolders.feature b/tests/acceptance/features/webUIRenameFolders/renameFolders.feature index 8070cd82fb5..dcf7541dfc6 100644 --- a/tests/acceptance/features/webUIRenameFolders/renameFolders.feature +++ b/tests/acceptance/features/webUIRenameFolders/renameFolders.feature @@ -9,7 +9,7 @@ Feature: rename folders And user "Alice" has created folder "simple-empty-folder" in the server And user "Alice" has uploaded file "lorem.txt" to "lorem.txt" in the server And user "Alice" has logged in using the webUI - And the user has browsed to the files page + And the user has browsed to the personal page @ocisSmokeTest Scenario Outline: Rename a folder @@ -140,7 +140,7 @@ Feature: rename folders Then folder "simple.part" should be listed on the webUI Scenario: User tries to rename a folder that used to exist but does not anymore - Given the user has browsed to the files page + Given the user has browsed to the personal page And the following files have been deleted by user "Alice" in the server | name | | simple-folder | @@ -157,7 +157,7 @@ Feature: rename folders When the user renames folder "simple-folder" to "" using the webUI Then folder "" should be listed on the webUI Examples: - | to_name | - | fo. | - | fo.1 | - | fo.xyz | + | to_name | + | fo. | + | fo.1 | + | fo.xyz | diff --git a/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature b/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature index 484d6ae726c..58011446166 100644 --- a/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature +++ b/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature @@ -12,7 +12,7 @@ Feature: accept/decline shares coming from internal users | Brian | And user "Brian" has logged in using the webUI - @issue-ocis-1950 + @issue-ocis-1950 Scenario: reject a share that you received as user and as group member Given these groups have been created in the server: | groupname | @@ -37,7 +37,7 @@ Feature: accept/decline shares coming from internal users And user "Brian" has been added to group "grp1" in the server And user "Alice" has shared folder "/simple-folder" with user "Brian" in the server And user "Brian" has accepted the share "Shares/simple-folder" offered by user "Alice" in the server - And the user has browsed to the files page + And the user has browsed to the personal page And the user opens folder "Shares" using the webUI When the user shares folder "simple-folder" with group "grp1" as "Viewer" using the webUI And the user deletes folder "simple-folder" using the webUI @@ -58,7 +58,7 @@ Feature: accept/decline shares coming from internal users And user "Alice" has shared file "/testimage.jpg" with group "grp1" in the server And user "Brian" has accepted the share "Shares/simple-folder" offered by user "Alice" in the server And user "Brian" has accepted the share "Shares/testimage.jpg" offered by user "Alice" in the server - And the user has browsed to the files page + And the user has browsed to the personal page When the user opens folder "Shares" using the webUI And the user deletes folder "simple-folder" using the webUI And the user deletes file "testimage.jpg" using the webUI @@ -209,11 +209,11 @@ Feature: accept/decline shares coming from internal users Then file "lorem.txt" shared by "Alice Hansen" should be in "Declined" state on the webUI @ocis-issue-714 @issue-5532 - Scenario: the deleted shared file is restored back to all files list when accepted from the shared with me file list + Scenario: the deleted shared file is restored back to the personal file list when accepted from the shared with me file list Given user "Alice" has created file "lorem.txt" in the server And user "Alice" has shared file "lorem.txt" with user "Brian" in the server And user "Brian" has accepted the share "Shares/lorem.txt" offered by user "Alice" in the server - And the following files have been deleted by user "Brian" in the server + And the following files have been deleted by user "Brian" in the server | name | | Shares/lorem.txt | When the user browses to the shared-with-me page in declined shares view diff --git a/tests/acceptance/features/webUISharingAcceptSharesToRoot/acceptShares.feature b/tests/acceptance/features/webUISharingAcceptSharesToRoot/acceptShares.feature index fe0b7df1b42..f4e13056397 100644 --- a/tests/acceptance/features/webUISharingAcceptSharesToRoot/acceptShares.feature +++ b/tests/acceptance/features/webUISharingAcceptSharesToRoot/acceptShares.feature @@ -38,7 +38,7 @@ Feature: accept/decline shares coming from internal users And user "Brian" has been added to group "grp1" in the server And user "Alice" has shared folder "/simple-folder" with user "Brian" in the server And user "Brian" has accepted the share "simple-folder" offered by user "Alice" in the server - And the user has browsed to the files page + And the user has browsed to the personal page When the user shares folder "simple-folder (2)" with group "grp1" as "Viewer" using the webUI And the user deletes folder "simple-folder (2)" using the webUI And the user browses to the shared-with-me page in declined shares view @@ -59,7 +59,7 @@ Feature: accept/decline shares coming from internal users And user "Alice" has shared folder "/testimage.jpg" with group "grp1" in the server And user "Brian" has accepted the share "simple-folder" offered by user "Alice" in the server And user "Brian" has accepted the share "testimage.jpg" offered by user "Alice" in the server - And the user has browsed to the files page + And the user has browsed to the personal page When the user deletes folder "simple-folder" using the webUI And the user deletes file "testimage.jpg" using the webUI Then folder "simple-folder" should not be listed on the webUI @@ -96,7 +96,7 @@ Feature: accept/decline shares coming from internal users And user "Brian" has been added to group "grp1" in the server And user "Alice" has shared folder "/simple-folder" with group "grp1" in the server And user "Alice" has shared folder "/testimage.jpg" with user "Brian" in the server - And the user has browsed to the files page + And the user has browsed to the personal page When the user deletes folder "simple-folder" using the webUI And the user deletes file "testimage.jpg" using the webUI Then folder "simple-folder" should not be listed on the webUI @@ -142,7 +142,7 @@ Feature: accept/decline shares coming from internal users And user "Brian" has created folder "/simple-folder" in the server And user "Brian" has created folder "/simple-folder/shared" in the server And user "Alice" has shared folder "simple-folder" with user "Brian" with "create, read, share, update" permissions in the server - And user "Brian" has moved folder "/simple-folder (2)" to "/simple-folder/shared" in the server + And user "Brian" has moved folder "/simple-folder (2)" to "/simple-folder/shared" in the server And the user has reloaded the current page of the webUI When the user opens folder "simple-folder" using the webUI And the user deletes folder "shared" using the webUI diff --git a/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletion.feature b/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletion.feature index 1b05dffe3e2..39840f142d4 100644 --- a/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletion.feature +++ b/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletion.feature @@ -56,7 +56,7 @@ Feature: Autocompletion of share-with names Scenario: autocompletion for a pattern that does not match any user or group Given user "regularuser" has created folder "simple-folder" in the server And user "regularuser" has logged in using the webUI - And the user has browsed to the files page + And the user has browsed to the personal page And the user has opened the share dialog for folder "simple-folder" When the user types "doesnotexist" in the share-with-field @@ -66,7 +66,7 @@ Feature: Autocompletion of share-with names Scenario: autocompletion when minimum characters is the default (2) and not enough characters are typed Given user "regularuser" has created folder "simple-folder" in the server And user "regularuser" has logged in using the webUI - And the user has browsed to the files page + And the user has browsed to the personal page And the user has opened the share dialog for folder "simple-folder" When the user types "u" in the share-with-field @@ -77,7 +77,7 @@ Feature: Autocompletion of share-with names Given the administrator has set the minimum characters for sharing autocomplete to "4" in the server And user "regularuser" has created folder "simple-folder" in the server And user "regularuser" has logged in using the webUI - And the user has browsed to the files page + And the user has browsed to the personal page And the user has opened the share dialog for folder "simple-folder" When the user types "use" in the share-with-field @@ -88,7 +88,7 @@ Feature: Autocompletion of share-with names Given the administrator has set the minimum characters for sharing autocomplete to "3" in the server And user "regularuser" has created folder "simple-folder" in the server And user "regularuser" has logged in using the webUI - And the user has browsed to the files page + And the user has browsed to the personal page And these users have been created without initialization and without skeleton files in the server: | username | password | displayname | email | | use | %alt1% | Use | uz@oc.com.np | @@ -105,7 +105,7 @@ Feature: Autocompletion of share-with names | groupname | | fi | And user "regularuser" has logged in using the webUI - And the user has browsed to the files page + And the user has browsed to the personal page And the user has opened the share dialog for folder "simple-folder" When the user types "fi" in the share-with-field @@ -116,7 +116,7 @@ Feature: Autocompletion of share-with names Given the administrator has set the minimum characters for sharing autocomplete to "3" in the server And user "regularuser" has created folder "simple-folder" in the server And user "regularuser" has logged in using the webUI - And the user has browsed to the files page + And the user has browsed to the personal page And the user has opened the share dialog for folder "simple-folder" When the user types "use" in the share-with-field @@ -128,7 +128,7 @@ Feature: Autocompletion of share-with names Scenario: autocompletion of a pattern that matches regular existing users but also a user with whom the item is already shared (folder) Given user "regularuser" has created folder "simple-folder" in the server And user "regularuser" has logged in using the webUI - And the user has browsed to the files page + And the user has browsed to the personal page And user "regularuser" has shared folder "simple-folder" with user "Alice" in the server And the user has opened the share dialog for folder "simple-folder" @@ -141,7 +141,7 @@ Feature: Autocompletion of share-with names Scenario: autocompletion of a pattern that matches regular existing users but also a user with whom the item is already shared (file) Given user "regularuser" has created file "data.zip" in the server And user "regularuser" has logged in using the webUI - And the user has browsed to the files page + And the user has browsed to the personal page And user "regularuser" has shared file "data.zip" with user "usergrp" in the server And the user has opened the share dialog for file "data.zip" @@ -155,7 +155,7 @@ Feature: Autocompletion of share-with names Given the administrator has set the minimum characters for sharing autocomplete to "2" in the server And user "regularuser" has created folder "simple-folder" in the server And user "regularuser" has logged in using the webUI - And the user has browsed to the files page + And the user has browsed to the personal page And user "regularuser" has shared folder "simple-folder" with group "finance1" in the server And the user has opened the share dialog for folder "simple-folder" @@ -169,7 +169,7 @@ Feature: Autocompletion of share-with names Given the administrator has set the minimum characters for sharing autocomplete to "2" in the server And user "regularuser" has created file "data.zip" in the server And user "regularuser" has logged in using the webUI - And the user has browsed to the files page + And the user has browsed to the personal page And user "regularuser" has shared file "data.zip" with group "finance1" in the server And the user has opened the share dialog for file "data.zip" diff --git a/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletionSpecialChars.feature b/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletionSpecialChars.feature index bf20da797bf..e32b3348acb 100644 --- a/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletionSpecialChars.feature +++ b/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletionSpecialChars.feature @@ -10,9 +10,9 @@ Feature: Autocompletion of share-with names | username | | regularuser | And these users have been created without initialization and without skeleton files in the server: - | username | password | displayname | email | - | two | %regular% | Brian Murphy | u2@oc.com.np | - | u444 | %regular% | Four | u3@oc.com.np | + | username | password | displayname | email | + | two | %regular% | Brian Murphy | u2@oc.com.np | + | u444 | %regular% | Four | u3@oc.com.np | And these groups have been created in the server: | groupname | | finance1 | @@ -26,7 +26,7 @@ Feature: Autocompletion of share-with names | | %regular% | SpecialUser | usrmail@oc.com.np | And user "regularuser" has created file "data.zip" in the server And user "regularuser" has logged in using the webUI - And the user has browsed to the files page + And the user has browsed to the personal page And the user has opened the share dialog for file "data.zip" When the user types "" in the share-with-field @@ -45,7 +45,7 @@ Feature: Autocompletion of share-with names | normalusr | %regular% | | msrmail@oc.com.np | And user "regularuser" has created file "data.zip" in the server And user "regularuser" has logged in using the webUI - And the user has browsed to the files page + And the user has browsed to the personal page And the user has opened the share dialog for file "data.zip" When the user types "" in the share-with-field @@ -63,7 +63,7 @@ Feature: Autocompletion of share-with names | | And user "regularuser" has created file "data.zip" in the server And user "regularuser" has logged in using the webUI - And the user has browsed to the files page + And the user has browsed to the personal page And the user has opened the share dialog for file "data.zip" When the user types "" in the share-with-field diff --git a/tests/acceptance/features/webUITrashbinRestore/trashbinRestore.feature b/tests/acceptance/features/webUITrashbinRestore/trashbinRestore.feature index 2ae9bcad94e..dbf20a55009 100644 --- a/tests/acceptance/features/webUITrashbinRestore/trashbinRestore.feature +++ b/tests/acceptance/features/webUITrashbinRestore/trashbinRestore.feature @@ -29,7 +29,7 @@ Feature: Restore deleted files/folders Scenario: Restore folder Given user "Alice" has created folder "folder with space" in the server - And the user has browsed to the files page + And the user has browsed to the personal page When the user deletes folder "folder with space" using the webUI And the user deletes folder "Folder,With,Comma" using the webUI And the user browses to the trashbin page @@ -145,9 +145,9 @@ Feature: Restore deleted files/folders When the user browses to the trashbin page And the user restores file "simple-folder/file-to-delete-and-restore" from the trashbin using the webUI Then the following error message should be displayed on the webUI - """ - Failed to restore "file-to-delete-and-restore" - """ + """ + Failed to restore "file-to-delete-and-restore" + """ #And a success message "file-to-delete-and-restore was restored successfully" should be displayed on the webUI #And as "Alice" the file with original path "simple-folder/file-to-delete-and-restore" should not exist in the trashbin And as "Alice" the file with original path "simple-folder/file-to-delete-and-restore" should exist in the trashbin in the server @@ -188,14 +188,14 @@ Feature: Restore deleted files/folders When the user browses to the trashbin page And the user restores file "simple-folder/file-to-delete-and-restore" from the trashbin using the webUI Then the following error message should be displayed on the webUI - """ - Failed to restore "file-to-delete-and-restore" - """ + """ + Failed to restore "file-to-delete-and-restore" + """ #And a success message "file-to-delete-and-restore was restored successfully" should be displayed on the webUI #And as "Alice" the file with original path "simple-folder/file-to-delete-and-restore" should not exist in the trashbin And as "Alice" the file with original path "simple-folder/file-to-delete-and-restore" should exist in the trashbin in the server And as "Alice" file "simple-folder/file-to-delete-and-restore" should not exist in the server - #And as "Alice" file "simple-folder/file-to-delete-and-restore" should exist + #And as "Alice" file "simple-folder/file-to-delete-and-restore" should exist @skipOnOC10 @issue-product-186 @issue-ocis-1057 @@ -215,7 +215,7 @@ Feature: Restore deleted files/folders #And a success message "file-to-delete-and-restore was restored successfully" should be displayed on the webUI #And as "Alice" the file with original path "simple-folder/file-to-delete-and-restore" should not exist in the trashbin And as "Alice" file "simple-folder/file-to-delete-and-restore" should not exist in the server - #And as "Alice" file "simple-folder/file-to-delete-and-restore" should exist + #And as "Alice" file "simple-folder/file-to-delete-and-restore" should exist @issue-1723 diff --git a/tests/acceptance/features/webUIUpload/uploadEdgecases.feature b/tests/acceptance/features/webUIUpload/uploadEdgecases.feature index 1468f8fef06..09773f9d81a 100644 --- a/tests/acceptance/features/webUIUpload/uploadEdgecases.feature +++ b/tests/acceptance/features/webUIUpload/uploadEdgecases.feature @@ -98,7 +98,7 @@ Feature: File Upload # upload into "simple-folder" because there is already a folder called "0" in the root Scenario: Upload a big file called "0" (when chunking in implemented that upload should be chunked) Given user "Alice" has created folder "simple-folder" in the server - And the user has browsed to the files page + And the user has browsed to the personal page And a file with the size of "30000000" bytes and the name "0" has been created locally in the middleware When the user opens folder "simple-folder" using the webUI And the user uploads a created file "0" using the webUI @@ -114,10 +114,10 @@ Feature: File Upload """ Failed to upload """ - # Then the following error message should be displayed on the webUI - # """ - # (Any nice error message) - # """ + # Then the following error message should be displayed on the webUI + # """ + # (Any nice error message) + # """ # When this issue is fixed merge with the scenario above @@ -130,7 +130,7 @@ Feature: File Upload """ Failed to upload """ - # Then the following error message should be displayed on the webUI - # """ - # (Any nice error message) - # """ +# Then the following error message should be displayed on the webUI +# """ +# (Any nice error message) +# """ diff --git a/tests/acceptance/features/webUIWebdavLockProtection/delete.feature b/tests/acceptance/features/webUIWebdavLockProtection/delete.feature index b4c931bdde2..38bd547dd1c 100644 --- a/tests/acceptance/features/webUIWebdavLockProtection/delete.feature +++ b/tests/acceptance/features/webUIWebdavLockProtection/delete.feature @@ -17,7 +17,7 @@ Feature: Locks Scenario Outline: deleting a locked file Given user "brand-new-user" has locked folder "lorem.txt" setting the following properties in the server | lockscope | | - And the user has browsed to the files page + And the user has browsed to the personal page When the user tries to delete folder "lorem.txt" using the webUI Then notifications should be displayed on the webUI with the text """ @@ -36,7 +36,7 @@ Feature: Locks Scenario Outline: deleting a file in a locked folder Given user "brand-new-user" has locked folder "simple-folder" setting the following properties in the server | lockscope | | - And the user has browsed to the files page + And the user has browsed to the personal page And the user has opened folder "simple-folder" When the user tries to delete folder "lorem.txt" using the webUI Then notifications should be displayed on the webUI with the text diff --git a/tests/acceptance/features/webUIWebdavLockProtection/move.feature b/tests/acceptance/features/webUIWebdavLockProtection/move.feature index 92df395b8c2..30e61dd3805 100644 --- a/tests/acceptance/features/webUIWebdavLockProtection/move.feature +++ b/tests/acceptance/features/webUIWebdavLockProtection/move.feature @@ -18,7 +18,7 @@ Feature: Locks Scenario Outline: moving a locked file Given user "brand-new-user" has locked file "lorem.txt" setting the following properties in the server | lockscope | | - And the user has browsed to the files page + And the user has browsed to the personal page When the user tries to move file "lorem.txt" into folder "simple-empty-folder" using the webUI Then notifications should be displayed on the webUI with the text """ @@ -39,7 +39,7 @@ Feature: Locks Scenario Outline: moving a file trying to overwrite a locked file Given user "brand-new-user" has locked file "/simple-folder/lorem.txt" setting the following properties in the server | lockscope | | - And the user has browsed to the files page + And the user has browsed to the personal page When the user tries to move file "lorem.txt" into folder "simple-folder" using the webUI Then notifications should be displayed on the webUI with the text """ @@ -61,7 +61,7 @@ Feature: Locks Scenario Outline: moving a file into a locked folder Given user "brand-new-user" has locked file "/simple-empty-folder" setting the following properties in the server | lockscope | | - And the user has browsed to the files page + And the user has browsed to the personal page When the user tries to move file "lorem.txt" into folder "simple-empty-folder" using the webUI Then notifications should be displayed on the webUI with the text """ @@ -83,7 +83,7 @@ Feature: Locks Scenario Outline: renaming of a locked file Given user "brand-new-user" has locked file "lorem.txt" setting the following properties in the server | lockscope | | - And the user has browsed to the files page + And the user has browsed to the personal page When the user tries to rename file "lorem.txt" to "a-renamed-file.txt" using the webUI Then notifications should be displayed on the webUI with the text """ diff --git a/tests/acceptance/features/webUIWebdavLockProtection/upload.feature b/tests/acceptance/features/webUIWebdavLockProtection/upload.feature index 66f9300d6f3..1dbe18f680e 100644 --- a/tests/acceptance/features/webUIWebdavLockProtection/upload.feature +++ b/tests/acceptance/features/webUIWebdavLockProtection/upload.feature @@ -17,7 +17,7 @@ Feature: Locks Scenario Outline: uploading a file, trying to overwrite a locked file Given user "brand-new-user" has locked file "lorem.txt" setting the following properties in the server | lockscope | | - And the user has browsed to the files page + And the user has browsed to the personal page When the user uploads overwriting file "lorem.txt" using the webUI Then notifications should be displayed on the webUI with the text """ @@ -35,7 +35,7 @@ Feature: Locks Scenario Outline: uploading a file, trying to overwrite a file in a locked folder Given user "brand-new-user" has locked folder "simple-folder" setting the following properties in the server | lockscope | | - And the user has browsed to the files page + And the user has browsed to the personal page And the user has opened folder "simple-folder" When the user uploads overwriting file "lorem.txt" using the webUI Then notifications should be displayed on the webUI with the text @@ -55,7 +55,7 @@ Feature: Locks Scenario Outline: uploading a new file into a locked folder Given user "brand-new-user" has locked folder "simple-folder" setting the following properties in the server | lockscope | | - And the user has browsed to the files page + And the user has browsed to the personal page And the user has opened folder "simple-folder" When the user uploads file "new-lorem.txt" using the webUI Then notifications should be displayed on the webUI with the text diff --git a/tests/acceptance/features/webUIWebdavLocks/unlock.feature b/tests/acceptance/features/webUIWebdavLocks/unlock.feature index 60b9d90fbb4..2c35bb590f1 100644 --- a/tests/acceptance/features/webUIWebdavLocks/unlock.feature +++ b/tests/acceptance/features/webUIWebdavLocks/unlock.feature @@ -46,7 +46,7 @@ Feature: Unlock locked files and folders | lockscope | | And user "brand-new-user" has locked folder "simple-folder" setting the following properties in the server | lockscope | | - And the user has browsed to the files page + And the user has browsed to the personal page When the user unlocks the lock no 1 of file "lorem.txt" on the webUI And the user unlocks the lock no 1 of folder "simple-folder" on the webUI Then file "lorem.txt" should not be marked as locked on the webUI @@ -63,7 +63,7 @@ Feature: Unlock locked files and folders Scenario Outline: deleting the only remaining lock of a folder by deleting it from a file (inside the folder) and reloading the page Given user "brand-new-user" has locked folder "simple-folder" setting the following properties in the server | lockscope | | - And the user has browsed to the files page + And the user has browsed to the personal page And the user has opened folder "simple-folder" using the webUI When the user unlocks the lock no 1 of file "lorem.txt" on the webUI Then file "lorem.txt" should not be marked as locked on the webUI @@ -101,7 +101,7 @@ Feature: Unlock locked files and folders | lockscope | shared | And user "receiver2" has locked folder "FOLDER_TO_SHARE" setting the following properties in the server | lockscope | shared | - And the user has browsed to the files page + And the user has browsed to the personal page When the user unlocks the lock no 1 of file "lorem.txt" on the webUI Then file "lorem.txt" should be marked as locked on the webUI And file "lorem.txt" should be marked as locked by user "receiver1" in the locks tab of the details panel on the webUI @@ -134,7 +134,7 @@ Feature: Unlock locked files and folders | lockscope | shared | And user "receiver2" has locked folder "FOLDER_TO_SHARE" setting the following properties in the server | lockscope | shared | - And the user has browsed to the files page + And the user has browsed to the personal page When the user unlocks the lock no 2 of file "lorem.txt" on the webUI Then file "lorem.txt" should be marked as locked on the webUI And file "lorem.txt" should be marked as locked by user "receiver1" in the locks tab of the details panel on the webUI @@ -167,7 +167,7 @@ Feature: Unlock locked files and folders | lockscope | shared | And user "brand-new-user" has locked folder "FOLDER_TO_SHARE" setting the following properties in the server | lockscope | shared | - And the user has browsed to the files page + And the user has browsed to the personal page When the user unlocks the lock no 3 of file "lorem.txt" on the webUI Then file "lorem.txt" should be marked as locked on the webUI And file "lorem.txt" should be marked as locked by user "receiver1" in the locks tab of the details panel on the webUI @@ -185,7 +185,7 @@ Feature: Unlock locked files and folders And user "brand-new-user" has shared file "/lorem.txt" with user "receiver1" in the server And user "receiver1" has locked file "lorem.txt" setting the following properties in the server | lockscope | | - And the user has browsed to the files page + And the user has browsed to the personal page When the user unlocks the lock no 1 of file "lorem.txt" on the webUI Then notifications should be displayed on the webUI with the text """ diff --git a/tests/acceptance/stepDefinitions/filesContext.js b/tests/acceptance/stepDefinitions/filesContext.js index d75a0092fbc..04fa5337524 100644 --- a/tests/acceptance/stepDefinitions/filesContext.js +++ b/tests/acceptance/stepDefinitions/filesContext.js @@ -89,15 +89,15 @@ When('the user browses to the favorites page using the webUI', function () { }) When('the user browses to the files page using the webUI', function () { - return client.page.webPage().navigateToUsingMenu('All files') + return client.page.webPage().navigateToUsingMenu('Personal') }) Then('the files table should be displayed', () => { return client.page.FilesPageElement.filesList().waitForElementVisible('@anyAfterLoading') }) -Given('the user has browsed to the files page', function () { - return client.page.personalPage().navigateToBreadcrumb('All files') +Given('the user has browsed to the personal page', function () { + return client.page.personalPage().navigateToBreadcrumb('Personal') }) When('the user opens folder {string} directly on the webUI', async function (folder) { diff --git a/tests/e2e/cucumber/shareFileJourney.feature b/tests/e2e/cucumber/shareFileJourney.feature index e53423fa5aa..4970b483418 100644 --- a/tests/e2e/cucumber/shareFileJourney.feature +++ b/tests/e2e/cucumber/shareFileJourney.feature @@ -26,8 +26,8 @@ Feature: share file And "Brian" accepts the following resource | testavatar.jpeg | And "Brian" copies the following resource - | resource | to | - | Shares/testavatar.jpeg | All files | + | resource | to | + | Shares/testavatar.jpeg | Personal | And "Brian" downloads the following file | resource | from | | testavatar.jpeg | Shares | diff --git a/tests/e2e/cucumber/shareFolderJourney.feature b/tests/e2e/cucumber/shareFolderJourney.feature index 63cd5cb8b77..961c8f97e2f 100644 --- a/tests/e2e/cucumber/shareFolderJourney.feature +++ b/tests/e2e/cucumber/shareFolderJourney.feature @@ -34,8 +34,8 @@ Feature: share folder with file | resource | to | | simple.pdf | Shares/folder_to_shared | And "Brian" copies the following resource - | resource | to | - | Shares/folder_to_shared | All files | + | resource | to | + | Shares/folder_to_shared | Personal | When "Alice" opens the "files" app Then "Alice" should see the following resources | folder_to_shared/lorem_new.txt | diff --git a/tests/e2e/support/page/files/allFiles.ts b/tests/e2e/support/page/files/allFiles.ts index e66f4eea6ec..404fb91c25b 100644 --- a/tests/e2e/support/page/files/allFiles.ts +++ b/tests/e2e/support/page/files/allFiles.ts @@ -230,7 +230,7 @@ export class AllFilesPage { await page.locator(`.oc-files-actions-${action}-trigger`).first().click() await page.locator('//nav[contains(@class, "oc-breadcrumb")]/ol/li[1]/a').click() - if (newLocation !== 'All files') { + if (newLocation !== 'Personal') { await filesCta.navigateToFolder({ page: page, path: newLocation }) }