summaryrefslogtreecommitdiffstats
path: root/apps/files_versions
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2016-11-29 20:48:03 +0100
committerRoeland Jago Douma <roeland@famdouma.nl>2016-11-29 20:48:03 +0100
commit66a77a885786cc8362c162cdb45564c9757c05a4 (patch)
treec9ddc2ab66666f01d23331a131a536d0a221da22 /apps/files_versions
parent4dcd0474d58bbcbea742948a03d3f26103f3933b (diff)
downloadnextcloud-server-66a77a885786cc8362c162cdb45564c9757c05a4.tar.gz
nextcloud-server-66a77a885786cc8362c162cdb45564c9757c05a4.zip
Fix js tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'apps/files_versions')
-rw-r--r--apps/files_versions/js/versionstabview.js3
-rw-r--r--apps/files_versions/tests/js/versionstabviewSpec.js19
2 files changed, 11 insertions, 11 deletions
diff --git a/apps/files_versions/js/versionstabview.js b/apps/files_versions/js/versionstabview.js
index 075e0e9cddb..a91366fd40a 100644
--- a/apps/files_versions/js/versionstabview.js
+++ b/apps/files_versions/js/versionstabview.js
@@ -254,15 +254,12 @@
* @param etag file etag (for caching)
*/
_lazyLoadPreview : function(options) {
- var self = this;
var url = options.url;
var mime = options.mime;
var ready = options.callback;
// get mime icon url
var iconURL = OC.MimeType.getIconUrl(mime);
- var previewURL,
- urlSpec = {};
ready(iconURL); // set mimeicon URL
var img = new Image();
diff --git a/apps/files_versions/tests/js/versionstabviewSpec.js b/apps/files_versions/tests/js/versionstabviewSpec.js
index 9b788db1970..cadd4eb363e 100644
--- a/apps/files_versions/tests/js/versionstabviewSpec.js
+++ b/apps/files_versions/tests/js/versionstabviewSpec.js
@@ -24,14 +24,16 @@ describe('OCA.Versions.VersionsTabView', function() {
timestamp: time1,
name: 'some file.txt',
size: 140,
- fullPath: '/subdir/some file.txt'
+ fullPath: '/subdir/some file.txt',
+ mimetype: 'text/plain'
});
var version2 = new VersionModel({
id: time2,
timestamp: time2,
name: 'some file.txt',
size: 150,
- fullPath: '/subdir/some file.txt'
+ fullPath: '/subdir/some file.txt',
+ mimetype: 'text/plain'
});
testVersions = [version1, version2];
@@ -80,14 +82,14 @@ describe('OCA.Versions.VersionsTabView', function() {
expect($item.find('.versiondate').text()).toEqual('seconds ago');
expect($item.find('.size').text()).toEqual('< 1 KB');
expect($item.find('.revertVersion').length).toEqual(1);
- expect($item.find('.preview').attr('src')).toEqual(version1.getPreviewUrl());
+ expect($item.find('.preview').attr('src')).toEqual('http://localhost/core/img/filetypes/text.svg');
$item = $versions.eq(1);
expect($item.find('.downloadVersion').attr('href')).toEqual(version2.getDownloadUrl());
expect($item.find('.versiondate').text()).toEqual('2 days ago');
expect($item.find('.size').text()).toEqual('< 1 KB');
expect($item.find('.revertVersion').length).toEqual(1);
- expect($item.find('.preview').attr('src')).toEqual(version2.getPreviewUrl());
+ expect($item.find('.preview').attr('src')).toEqual('http://localhost/core/img/filetypes/text.svg');
});
it('does not render revert button when no update permissions', function() {
@@ -104,13 +106,13 @@ describe('OCA.Versions.VersionsTabView', function() {
expect($item.find('.downloadVersion').attr('href')).toEqual(version1.getDownloadUrl());
expect($item.find('.versiondate').text()).toEqual('seconds ago');
expect($item.find('.revertVersion').length).toEqual(0);
- expect($item.find('.preview').attr('src')).toEqual(version1.getPreviewUrl());
+ expect($item.find('.preview').attr('src')).toEqual('http://localhost/core/img/filetypes/text.svg');
$item = $versions.eq(1);
expect($item.find('.downloadVersion').attr('href')).toEqual(version2.getDownloadUrl());
expect($item.find('.versiondate').text()).toEqual('2 days ago');
expect($item.find('.revertVersion').length).toEqual(0);
- expect($item.find('.preview').attr('src')).toEqual(version2.getPreviewUrl());
+ expect($item.find('.preview').attr('src')).toEqual('http://localhost/core/img/filetypes/text.svg');
});
});
@@ -156,7 +158,8 @@ describe('OCA.Versions.VersionsTabView', function() {
timestamp: time3,
name: 'some file.txt',
size: 54,
- fullPath: '/subdir/some file.txt'
+ fullPath: '/subdir/some file.txt',
+ mimetype: 'text/plain'
});
tabView.collection.add(version3);
@@ -167,7 +170,7 @@ describe('OCA.Versions.VersionsTabView', function() {
expect($item.find('.downloadVersion').attr('href')).toEqual(version3.getDownloadUrl());
expect($item.find('.versiondate').text()).toEqual('7 days ago');
expect($item.find('.revertVersion').length).toEqual(1);
- expect($item.find('.preview').attr('src')).toEqual(version3.getPreviewUrl());
+ expect($item.find('.preview').attr('src')).toEqual('http://localhost/core/img/filetypes/text.svg');
});
});