diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2014-09-11 17:56:00 +0400 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2014-09-15 16:04:44 +0400 |
| commit | 0d9f24a0efef20b9041e40817b10822a4700532d (patch) | |
| tree | 17d9640bcb15229cfe964ac53e82b40946d79e57 /tests/karma.config.js | |
| parent | 31898aa63548be8492b826b9bac6dc0f8bca8dee (diff) | |
Add timeout to user and group deletion notification
Added timeout in DeleteHandler to auto-delete after a delay.
Fixed issue where OC.Notification.hide() was called twice in a row when
deleting multiple entries, causing the second notification to disappear.
Fixed issue where "undo" click event handler was registered multiple
times when calling setNotifications() twice.
Added JS unit tests for the DeleteHandler class.
Refix undo users, groups feature
Timeout is now cleared in cancel().
Fixed click handler name for "undo" to be able to work with multiple
DeleteHandler instances (in our case one for users and one for groups)
so that there is no conflict.
Diffstat (limited to 'tests/karma.config.js')
| -rw-r--r-- | tests/karma.config.js | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tests/karma.config.js b/tests/karma.config.js index 14a0d7e8464..357fcf3f122 100644 --- a/tests/karma.config.js +++ b/tests/karma.config.js @@ -66,7 +66,15 @@ module.exports = function(config) { 'apps/files_external/js/mountsfilelist.js' ], testFiles: ['apps/files_external/tests/js/*.js'] - }]; + }, + { + name: 'settings', + srcFiles: [ + 'settings/js/users/deleteHandler.js' + ], + testFiles: ['settings/tests/js/users/deleteHandlerSpec.js'] + } + ]; } // respect NOCOVERAGE env variable |