Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve accessibility on user menu #5010

Merged
merged 4 commits into from
Apr 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions changelog/unreleased/enhancement-user-menu-a11y
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions packages/web-runtime/src/components/UserMenu.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div v-if="userId">
<nav v-if="userId" :aria-label="$gettext('Account menu')">
<oc-button
id="_userMenuButton"
ref="menuButton"
Expand Down Expand Up @@ -83,7 +83,7 @@
</li>
</ul>
</oc-drop>
</div>
</nav>
</template>

<script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down
65 changes: 48 additions & 17 deletions tests/acceptance/features/webUIFilesCopy/copy.feature
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 |
Expand All @@ -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 <file_name> using the webUI
And the user renames folder "simple-empty-folder" to <folder_name> using the webUI
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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 |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading