From 11235f1a7c12c1a3261a40c53ba38c641dffa78d Mon Sep 17 00:00:00 2001 From: talank Date: Mon, 12 Apr 2021 09:28:05 +0545 Subject: [PATCH 1/3] Wisely used large/small/without skeleton files in copy file tests --- ...lures-with-ocis-server-owncloud-storage.md | 15 ++--- .../features/webUIFilesCopy/copy.feature | 65 ++++++++++++++----- .../webUIFilesCopy/copyPrivateLinks.feature | 4 +- .../webUIFilesDetails/fileDetails.feature | 43 ++++++++---- 4 files changed, 90 insertions(+), 37 deletions(-) diff --git a/tests/acceptance/expected-failures-with-ocis-server-owncloud-storage.md b/tests/acceptance/expected-failures-with-ocis-server-owncloud-storage.md index 2cf9fe5cb00..b39487857ff 100644 --- a/tests/acceptance/expected-failures-with-ocis-server-owncloud-storage.md +++ b/tests/acceptance/expected-failures-with-ocis-server-owncloud-storage.md @@ -47,14 +47,14 @@ Other free text and markdown formatting can be used elsewhere in the document if - [webUIFavorites/unfavoriteFile.feature:60](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature#L60) - [webUIFavorites/unfavoriteFile.feature:73](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature#L73) - [webUIFavorites/unfavoriteFile.feature:85](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature#L85) -- [webUIFilesDetails/fileDetails.feature:35](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesDetails/fileDetails.feature#L35) -- [webUIFilesDetails/fileDetails.feature:46](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesDetails/fileDetails.feature#L46) +- [webUIFilesDetails/fileDetails.feature:38](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesDetails/fileDetails.feature#L38) +- [webUIFilesDetails/fileDetails.feature:51](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesDetails/fileDetails.feature#L51) ### [Sharing seems to work but does not work](https://github.com/owncloud/ocis/issues/1303) - [webUIDeleteFilesFolders/deleteFilesFolders.feature:77](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature#L77) - [webUIDeleteFilesFolders/deleteFilesFolders.feature:231](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature#L231) -- [webUIFilesDetails/fileDetails.feature:88](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesDetails/fileDetails.feature#L88) -- [webUIFilesDetails/fileDetails.feature:103](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesDetails/fileDetails.feature#L103) +- [webUIFilesDetails/fileDetails.feature:99](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesDetails/fileDetails.feature#L99) +- [webUIFilesDetails/fileDetails.feature:116](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesDetails/fileDetails.feature#L116) - [webUIFilesActionMenu/versions.feature:33](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesActionMenu/versions.feature#L33) - [webUIRenameFiles/renameFiles.feature:202](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIRenameFiles/renameFiles.feature#L202) - [webUIRenameFiles/renameFiles.feature:227](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIRenameFiles/renameFiles.feature#L227) @@ -122,8 +122,7 @@ Other free text and markdown formatting can be used elsewhere in the document if - [webUISharingPermissionsUsers/sharePermissionsUsers.feature:197](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature#L197) - [webUISharingPermissionsUsers/sharePermissionsUsers.feature:210](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature#L210) - [webUISharingPermissionsUsers/sharePermissionsUsers.feature:224](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature#L224) -- [webUIFilesCopy/copy.feature:71](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesCopy/copy.feature#L71) -- [webUIFilesCopy/copy.feature:79](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesCopy/copy.feature#L79) +- [webUIFilesCopy/copy.feature:98](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesCopy/copy.feature#L98) - [webUIMoveFilesFolders/moveFiles.feature:97](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIMoveFilesFolders/moveFiles.feature#L97) - [webUIMoveFilesFolders/moveFolders.feature:72](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIMoveFilesFolders/moveFolders.feature#L72) - [webUISharingPublicManagement/publicLinkIndicator.feature:12](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicManagement/publicLinkIndicator.feature#L12) @@ -133,8 +132,8 @@ Other free text and markdown formatting can be used elsewhere in the document if - [webUISharingPublicManagement/publicLinkIndicator.feature:98](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicManagement/publicLinkIndicator.feature#L98) ### [Copy private link option not available](https://github.com/owncloud/ocis/issues/1409) -- [webUIFilesCopy/copyPrivateLinks.feature:18](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesCopy/copyPrivateLinks.feature#L18) -- [webUIFilesCopy/copyPrivateLinks.feature:19](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesCopy/copyPrivateLinks.feature#L19) +- [webUIFilesCopy/copyPrivateLinks.feature:20](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesCopy/copyPrivateLinks.feature#L20) +- [webUIFilesCopy/copyPrivateLinks.feature:21](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesCopy/copyPrivateLinks.feature#L21) ### [Display previews](https://github.com/owncloud/web/issues/276) - [webUIFilesList/fileList.feature:28](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesList/fileList.feature#L28) diff --git a/tests/acceptance/features/webUIFilesCopy/copy.feature b/tests/acceptance/features/webUIFilesCopy/copy.feature index 2ab8ca49e64..569f553e976 100644 --- a/tests/acceptance/features/webUIFilesCopy/copy.feature +++ b/tests/acceptance/features/webUIFilesCopy/copy.feature @@ -4,11 +4,15 @@ Feature: copy files and folders So that I can work safely on a copy without changing the original Background: - Given user "Alice" has been created with default attributes + Given user "Alice" has been created with default attributes and without skeleton files @smokeTest Scenario: copy a file and a folder into a folder - Given user "Alice" has logged in using the webUI + Given user "Alice" has uploaded file "data.zip" to "data.zip" + And user "Alice" has created folder "simple-empty-folder" + And user "Alice" has created folder "simple-folder" + And user "Alice" has created folder "strängé नेपाली folder empty" + And user "Alice" has logged in using the webUI And the user has browsed to the files page When the user copies file "data.zip" into folder "simple-empty-folder" using the webUI Then breadcrumb for folder "simple-empty-folder" should be displayed on the webUI @@ -20,14 +24,21 @@ Feature: copy files and folders Scenario: copy a file into a folder where a file with the same name already exists - Given user "Alice" has logged in using the webUI + Given user "Alice" has created file "strängé filename (duplicate #2 &).txt" + And user "Alice" has created folder "strängé नेपाली folder" + And user "Alice" has created file "strängé नेपाली folder/strängé filename (duplicate #2 &).txt" + And user "Alice" has logged in using the webUI And the user has browsed to the files 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 'An error occurred while copying strängé filename (duplicate #2 &).txt' should be displayed on the webUI @smokeTest Scenario: Copy multiple files at once - Given user "Alice" has logged in using the webUI + Given user "Alice" has uploaded file "data.zip" to "data.zip" + And user "Alice" has created file "lorem.txt" + And user "Alice" has uploaded file "new-data.zip" to "testapp.zip" + And user "Alice" has created folder "simple-empty-folder" + And user "Alice" has logged in using the webUI And the user has browsed to the files page When the user batch copies these files into folder "simple-empty-folder" using the webUI | file_name | @@ -43,7 +54,9 @@ Feature: copy files and folders Scenario Outline: copy a file into a folder (problematic characters) - Given user "Alice" has logged in using the webUI + Given user "Alice" has created file "lorem.txt" + And user "Alice" has created folder "simple-empty-folder" + And user "Alice" has logged in using the webUI And the user has browsed to the files page When the user renames file "lorem.txt" to using the webUI And the user renames folder "simple-empty-folder" to using the webUI @@ -59,7 +72,10 @@ Feature: copy files and folders @issue-3755 Scenario: copy files on a public share - Given user "Alice" has shared folder "simple-folder" with link with "read, update, create, delete" permissions + Given user "Alice" has created folder "simple-folder" + And user "Alice" has created folder "simple-folder/simple-empty-folder" + And user "Alice" has uploaded file "data.zip" to "simple-folder/data.zip" + And user "Alice" has shared folder "simple-folder" with link with "read, update, create, delete" permissions And the public uses the webUI to access the last public link created by user "Alice" And the user copies file "data.zip" into folder "simple-empty-folder" using the webUI Then breadcrumb for folder "simple-empty-folder" should be displayed on the webUI @@ -69,38 +85,49 @@ Feature: copy files and folders @issue-ocis-reva-243 Scenario: copy a file into another folder with no change permission - Given user "Brian" has been created with default attributes + Given user "Alice" has created file "lorem.txt" + And user "Alice" has created folder "simple-folder" + And user "Brian" has been created with default attributes and without skeleton files + And user "Brian" has created folder "simple-folder" And user "Brian" has shared folder "simple-folder" with user "Alice" with "read" permissions And user "Alice" has logged in using the webUI - When the user tries to copy file "lorem.txt" into folder "simple-folder (2)" using the webUI - Then as "Alice" file "simple-folder (2)/lorem (2).txt" should not exist + When the user tries to copy file "lorem.txt" into folder "simple-folder" using the webUI + Then as "Alice" file "simple-folder/lorem.txt" should not exist @issue-ocis-reva-243 Scenario: copy a folder into another folder with no change permission - Given user "Brian" has been created with default attributes + Given user "Alice" has created folder "simple-empty-folder" + And user "Brian" has been created with default attributes and without skeleton files + And user "Brian" has created folder "simple-folder" And user "Brian" has shared folder "simple-folder" with user "Alice" with "read" permissions And user "Alice" has logged in using the webUI - When the user tries to copy folder "simple-empty-folder" into folder "simple-folder (2)" using the webUI - Then as "Alice" file "simple-folder (2)/simple-empty-folder (2)" should not exist + When the user tries to copy folder "simple-empty-folder" into folder "simple-folder" using the webUI + Then as "Alice" file "simple-folder/simple-empty-folder" should not exist Scenario: copy a folder into the same folder - Given user "Alice" has logged in using the webUI + Given user "Alice" has created folder "simple-empty-folder" + And user "Alice" has logged in using the webUI When the user tries to copy folder "simple-empty-folder" into folder "simple-empty-folder" using the webUI Then the error message with header 'An error occurred while copying simple-empty-folder' should be displayed on the webUI And as "Alice" file "simple-empty-folder/simple-empty-folder" should not exist Scenario: copy a folder into another folder with same name - Given user "Alice" has logged in using the webUI + Given user "Alice" has created folder "simple-empty-folder" + And user "Alice" has created folder "folder with space" + And user "Alice" has created folder "folder with space/simple-empty-folder" + And user "Alice" has logged in using the webUI When the user copies folder "simple-empty-folder" into folder "folder with space/simple-empty-folder" using the webUI - Then breadcrumb for folder "simple-empty-folder" should be displayed on the webUI + Then breadcrumb for folder "folder with space" should be displayed on the webUI And folder "simple-empty-folder" should be listed on the webUI And as "Alice" folder "folder with space/simple-empty-folder/simple-empty-folder" should exist And as "Alice" folder "simple-empty-folder" should exist Scenario: cancel copying a file - Given user "Alice" has logged in using the webUI + Given user "Alice" has uploaded file "data.zip" to "data.zip" + And user "Alice" has created folder "simple-empty-folder" + And user "Alice" has logged in using the webUI And the user has browsed to the files page When the user opens the file action menu of folder "data.zip" using the webUI And the user selects copy action for folder "data.zip" using the webUI @@ -110,7 +137,11 @@ Feature: copy files and folders But file "data.zip" should not be listed in the folder "simple-empty-folder" on the webUI Scenario: cancel copying of multiple files at once - Given user "Alice" has logged in using the webUI + Given user "Alice" has uploaded file "data.zip" to "data.zip" + And user "Alice" has uploaded file "new-data.zip" to "testapp.zip" + And user "Alice" has created file "lorem.txt" + And user "Alice" has created folder "simple-empty-folder" + And user "Alice" has logged in using the webUI And the user has browsed to the files page When the user marks these files for batch action using the webUI | file_name | diff --git a/tests/acceptance/features/webUIFilesCopy/copyPrivateLinks.feature b/tests/acceptance/features/webUIFilesCopy/copyPrivateLinks.feature index 09196e7e37e..d3278d9b450 100644 --- a/tests/acceptance/features/webUIFilesCopy/copyPrivateLinks.feature +++ b/tests/acceptance/features/webUIFilesCopy/copyPrivateLinks.feature @@ -5,7 +5,9 @@ Feature: copy path as a permanent link So that I can share it with other users Background: - Given user "Alice" has been created with default attributes + Given user "Alice" has been created with default attributes and without skeleton files + And user "Alice" has created folder "simple-folder" + And user "Alice" has created file "lorem.txt" And user "Alice" has logged in using the webUI And the user has browsed to the files page diff --git a/tests/acceptance/features/webUIFilesDetails/fileDetails.feature b/tests/acceptance/features/webUIFilesDetails/fileDetails.feature index 5a34db5b5fe..55029b5a07b 100644 --- a/tests/acceptance/features/webUIFilesDetails/fileDetails.feature +++ b/tests/acceptance/features/webUIFilesDetails/fileDetails.feature @@ -4,15 +4,16 @@ Feature: User can open the details panel for any file or folder So that the details of the file or folder are visible to me Background: - Given these users have been created with default attributes: + Given these users have been created with default attributes and without skeleton files: | username | | Alice | | Brian | And user "Alice" has logged in using the webUI - And the user has browsed to the files page @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" + And the user has browsed to the files page When the user picks the row of file "lorem.txt" in the webUI Then the app-sidebar should be visible And the thumbnail should be visible in the app-sidebar @@ -22,6 +23,8 @@ 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" + And the user has browsed to the files page When the user picks the row of folder "simple-folder" in the webUI Then the app-sidebar should be visible And the thumbnail should be visible in the app-sidebar @@ -33,7 +36,9 @@ 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 favorited element "lorem.txt" + Given user "Alice" has created file "lorem.txt" + And the user has browsed to the files page + And user "Alice" has favorited element "lorem.txt" And the user has browsed to the favorites page When the user picks the row of file "lorem.txt" in the webUI Then the app-sidebar should be visible @@ -44,7 +49,9 @@ 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 favorited element "simple-folder" + Given user "Alice" has created folder "simple-folder" + And the user has browsed to the files page + And user "Alice" has favorited element "simple-folder" And the user has browsed to the favorites page When the user picks the row of folder "simple-folder" in the webUI Then the app-sidebar should be visible @@ -57,7 +64,9 @@ Feature: User can open the details panel for any file or folder @skip @yetToImplement @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 the user has created a new public link for folder "simple-folder" using the webUI + Given user "Alice" has created folder "simple-folder" + And the user has browsed to the files page + And the user has created a new public link for folder "simple-folder" using the webUI When the user browses to the shared-by-link page Then folder "simple-folder" should be listed on the webUI When the user opens the file action menu of folder "simple-folder" in the webUI @@ -71,7 +80,9 @@ Feature: User can open the details panel for any file or folder @comments-app-required @ocis-reva-issue-64 Scenario: user shares a file and then the details dialog should work in a Shared with others page - Given user "Alice" has shared folder "simple-folder" with user "Brian" + Given user "Alice" has created folder "simple-folder" + And the user has browsed to the files page + And user "Alice" has shared folder "simple-folder" with user "Brian" When the user browses to the shared-with-others page Then folder "simple-folder" should be listed on the webUI When the user picks the row of folder "simple-folder" in the webUI @@ -86,7 +97,9 @@ Feature: User can open the details panel for any file or folder @comments-app-required @ocis-reva-issue-64 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 a new public link for resource "simple-folder" + Given user "Alice" has created folder "simple-folder" + And the user has browsed to the files page + And user "Alice" has created a new public link for resource "simple-folder" When the user browses to the shared-with-others page Then folder "simple-folder" should be listed on the webUI When the user picks the row of folder "simple-folder" in the webUI @@ -101,11 +114,13 @@ Feature: User can open the details panel for any file or folder @comments-app-required @ocis-reva-issue-64 Scenario: the recipient user should be able to view different areas of details panel in Shared with me page - Given user "Alice" has shared folder "simple-folder" with user "Brian" + Given user "Alice" has created folder "simple-folder" + And the user has browsed to the files page + And user "Alice" has shared folder "simple-folder" with user "Brian" And the user re-logs in as "Brian" using the webUI When the user browses to the shared-with-me page - Then folder "simple-folder (2)" should be listed on the webUI - When the user picks the row of folder "simple-folder (2)" in the webUI + Then folder "simple-folder" should be listed on the webUI + When the user picks the row of folder "simple-folder" in the webUI Then the app-sidebar should be visible And the thumbnail should be visible in the app-sidebar When the user switches to "people" accordion item in details panel using the webUI @@ -126,6 +141,8 @@ Feature: User can open the details panel for any file or folder @skip @yetToImplement @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" + And the user has browsed to the files 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 @@ -142,6 +159,8 @@ 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" + And the user has browsed to the files page When the user picks the row of file "lorem.txt" in the webUI Then the app-sidebar should be visible When the user closes the app-sidebar using the webUI @@ -149,6 +168,8 @@ 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" + And the user has browsed to the files page Given the app-sidebar for file "simple-folder" has been visible on the webUI When the user opens folder "simple-folder" using the webUI - Then the app-sidebar should be invisible \ No newline at end of file + Then the app-sidebar should be invisible From 2b796d2d9242c1ba56696ed56b9c3d1b7bd9cda6 Mon Sep 17 00:00:00 2001 From: Jannik Stehle Date: Fri, 23 Apr 2021 15:21:47 +0200 Subject: [PATCH 2/3] Improve accessibility on user menu --- changelog/unreleased/enhancement-user-menu-a11y | 5 +++++ packages/web-runtime/src/components/UserMenu.vue | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 changelog/unreleased/enhancement-user-menu-a11y diff --git a/changelog/unreleased/enhancement-user-menu-a11y b/changelog/unreleased/enhancement-user-menu-a11y new file mode 100644 index 00000000000..f2f7ac262e0 --- /dev/null +++ b/changelog/unreleased/enhancement-user-menu-a11y @@ -0,0 +1,5 @@ +Enhancement: Improve accessibility on user menu + +Wrapped the user menu button in a nav element and added an aria-label which describes it as main navigation. + +https://github.com/owncloud/web/pull/5010 diff --git a/packages/web-runtime/src/components/UserMenu.vue b/packages/web-runtime/src/components/UserMenu.vue index b27930e59db..1e6983b187d 100644 --- a/packages/web-runtime/src/components/UserMenu.vue +++ b/packages/web-runtime/src/components/UserMenu.vue @@ -1,5 +1,5 @@