mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix js tests 

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2016-11-29 20:48:03 +01:00
parent 4dcd0474d5
commit 66a77a8857
No known key found for this signature in database
GPG Key ID: F941078878347C0C
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/files_versions/js/versionstabview.js
View File

@ -254,15 +254,12 @@
* @param etag file etag (for caching) * @param etag file etag (for caching)
*/ */
_lazyLoadPreview : function(options) { _lazyLoadPreview : function(options) {
var self = this;
var url = options.url; var url = options.url;
var mime = options.mime; var mime = options.mime;
var ready = options.callback; var ready = options.callback;
// get mime icon url // get mime icon url
var iconURL = OC.MimeType.getIconUrl(mime); var iconURL = OC.MimeType.getIconUrl(mime);
var previewURL,
urlSpec = {};
ready(iconURL); // set mimeicon URL ready(iconURL); // set mimeicon URL
var img = new Image(); var img = new Image();

19
apps/files_versions/tests/js/versionstabviewSpec.js
View File

@ -24,14 +24,16 @@ describe('OCA.Versions.VersionsTabView', function() {
timestamp: time1, timestamp: time1,
name: 'some file.txt', name: 'some file.txt',
size: 140, size: 140,
fullPath: '/subdir/some file.txt' fullPath: '/subdir/some file.txt',
mimetype: 'text/plain'
}); });
var version2 = new VersionModel({ var version2 = new VersionModel({
id: time2, id: time2,
timestamp: time2, timestamp: time2,
name: 'some file.txt', name: 'some file.txt',
size: 150, size: 150,
fullPath: '/subdir/some file.txt' fullPath: '/subdir/some file.txt',
mimetype: 'text/plain'
}); });
testVersions = [version1, version2]; testVersions = [version1, version2];
@ -80,14 +82,14 @@ describe('OCA.Versions.VersionsTabView', function() {
expect($item.find('.versiondate').text()).toEqual('seconds ago'); expect($item.find('.versiondate').text()).toEqual('seconds ago');
expect($item.find('.size').text()).toEqual('< 1 KB'); expect($item.find('.size').text()).toEqual('< 1 KB');
expect($item.find('.revertVersion').length).toEqual(1); 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); $item = $versions.eq(1);
expect($item.find('.downloadVersion').attr('href')).toEqual(version2.getDownloadUrl()); expect($item.find('.downloadVersion').attr('href')).toEqual(version2.getDownloadUrl());
expect($item.find('.versiondate').text()).toEqual('2 days ago'); expect($item.find('.versiondate').text()).toEqual('2 days ago');
expect($item.find('.size').text()).toEqual('< 1 KB'); expect($item.find('.size').text()).toEqual('< 1 KB');
expect($item.find('.revertVersion').length).toEqual(1); 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() { 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('.downloadVersion').attr('href')).toEqual(version1.getDownloadUrl());
expect($item.find('.versiondate').text()).toEqual('seconds ago'); expect($item.find('.versiondate').text()).toEqual('seconds ago');
expect($item.find('.revertVersion').length).toEqual(0); 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); $item = $versions.eq(1);
expect($item.find('.downloadVersion').attr('href')).toEqual(version2.getDownloadUrl()); expect($item.find('.downloadVersion').attr('href')).toEqual(version2.getDownloadUrl());
expect($item.find('.versiondate').text()).toEqual('2 days ago'); expect($item.find('.versiondate').text()).toEqual('2 days ago');
expect($item.find('.revertVersion').length).toEqual(0); 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, timestamp: time3,
name: 'some file.txt', name: 'some file.txt',
size: 54, size: 54,
fullPath: '/subdir/some file.txt' fullPath: '/subdir/some file.txt',
mimetype: 'text/plain'
}); });
tabView.collection.add(version3); 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('.downloadVersion').attr('href')).toEqual(version3.getDownloadUrl());
expect($item.find('.versiondate').text()).toEqual('7 days ago'); expect($item.find('.versiondate').text()).toEqual('7 days ago');
expect($item.find('.revertVersion').length).toEqual(1); 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');
}); });
}); });