diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-02 14:11:46 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-02 14:11:46 +0200 |
| commit | 594a3e4e22223389a306acad4e3921027decad96 (patch) | |
| tree | 2f01ea64c8f09fc87448648e3a5def8c6fbec399 /apps | |
| parent | 4fb2ef3bacf2ae8eeac0b5bebecd98b90cca5511 (diff) | |
| parent | 4b3a5a257f0861db23b8d97836afdf398b3fef9a (diff) | |
| download | nextcloud-server-594a3e4e22223389a306acad4e3921027decad96.tar.gz nextcloud-server-594a3e4e22223389a306acad4e3921027decad96.zip | |
Merge pull request #19523 from owncloud/fix-seconds-ago
Fix moment.js "a few seconds ago" with "seconds ago"
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/tests/js/mainfileinfodetailviewSpec.js | 2 | ||||
| -rw-r--r-- | apps/files_versions/tests/js/versionstabviewSpec.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files/tests/js/mainfileinfodetailviewSpec.js b/apps/files/tests/js/mainfileinfodetailviewSpec.js index 2b9e2b23f93..f4403196f2e 100644 --- a/apps/files/tests/js/mainfileinfodetailviewSpec.js +++ b/apps/files/tests/js/mainfileinfodetailviewSpec.js @@ -58,7 +58,7 @@ describe('OCA.Files.MainFileInfoDetailView tests', function() { expect(view.$el.find('.fileName h3').attr('title')).toEqual('One.txt'); expect(view.$el.find('.size').text()).toEqual('117.7 MB'); expect(view.$el.find('.size').attr('title')).toEqual('123456789 bytes'); - expect(view.$el.find('.date').text()).toEqual('a few seconds ago'); + expect(view.$el.find('.date').text()).toEqual('seconds ago'); expect(view.$el.find('.date').attr('title')).toEqual(dateExpected); clock.restore(); }); diff --git a/apps/files_versions/tests/js/versionstabviewSpec.js b/apps/files_versions/tests/js/versionstabviewSpec.js index 4435f38ef7e..306dd66be2a 100644 --- a/apps/files_versions/tests/js/versionstabviewSpec.js +++ b/apps/files_versions/tests/js/versionstabviewSpec.js @@ -76,7 +76,7 @@ describe('OCA.Versions.VersionsTabView', function() { expect($versions.length).toEqual(2); var $item = $versions.eq(0); expect($item.find('.downloadVersion').attr('href')).toEqual(version1.getDownloadUrl()); - expect($item.find('.versiondate').text()).toEqual('a few seconds ago'); + expect($item.find('.versiondate').text()).toEqual('seconds ago'); expect($item.find('.revertVersion').length).toEqual(1); expect($item.find('.preview').attr('src')).toEqual(version1.getPreviewUrl()); |