aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/tests
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2015-08-18 10:43:17 +0200
committerVincent Petry <pvince81@owncloud.com>2015-08-18 10:43:17 +0200
commitffff156965beaf52a22a024e240bf56a9f8d2b44 (patch)
tree12c0bb256e7ebc71d20ed9afcb36e72b8402a1c3 /apps/files/tests
parent03965053c34bc0fe673ea0da82ac83ff68ce3fa3 (diff)
parentbbff530b65f38bc7eac071e5142d9f07bd3d9f94 (diff)
downloadnextcloud-server-ffff156965beaf52a22a024e240bf56a9f8d2b44.tar.gz
nextcloud-server-ffff156965beaf52a22a024e240bf56a9f8d2b44.zip
Merge pull request #18310 from hasso/selection-string-fix
Fix the string counting a selected files/dirs
Diffstat (limited to 'apps/files/tests')
-rw-r--r--apps/files/tests/js/filelistSpec.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index 38073389382..7ed60084fa9 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -1606,7 +1606,7 @@ describe('OCA.Files.FileList tests', function() {
fileList.findFileEl('One.txt').find('input:checkbox').click();
fileList.findFileEl('Three.pdf').find('input:checkbox').click();
fileList.findFileEl('somedir').find('input:checkbox').click();
- expect($summary.text()).toEqual('1 folder & 2 files');
+ expect($summary.text()).toEqual('1 folder and 2 files');
});
it('Unselecting files hides selection summary', function() {
var $summary = $('#headerName a.name>span:first');