aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files
diff options
context:
space:
mode:
authorJulius Haertl <jus@bitgrid.net>2016-07-30 16:29:06 +0200
committerJulius Haertl <jus@bitgrid.net>2016-07-30 16:30:05 +0200
commit217b52085d328386832b5e0253fe7ddb87d2cb6e (patch)
treed0f8738999552d9f3c9d72bafa406cf7329da0c1 /apps/files
parentfdcba04c98cf9bffe1ff0d29671fdea1b7f643cd (diff)
downloadnextcloud-server-217b52085d328386832b5e0253fe7ddb87d2cb6e.tar.gz
nextcloud-server-217b52085d328386832b5e0253fe7ddb87d2cb6e.zip
Fix javascript tests for sidebar animation
Diffstat (limited to 'apps/files')
-rw-r--r--apps/files/tests/js/filelistSpec.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index 97fa9804a22..651ba6eef1e 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -2063,6 +2063,7 @@ describe('OCA.Files.FileList tests', function() {
expect(fileList._detailsView.getFileInfo()).toEqual(null);
});
it('closes sidebar whenever the currently highlighted file was removed from the list', function() {
+ jQuery.fx.off = true;
var $tr = fileList.findFileEl('One.txt');
$tr.find('td.filename>a.name').click();
expect($tr.hasClass('highlighted')).toEqual(true);
@@ -2072,6 +2073,7 @@ describe('OCA.Files.FileList tests', function() {
expect($('#app-sidebar').hasClass('disappear')).toEqual(false);
fileList.remove('One.txt');
expect($('#app-sidebar').hasClass('disappear')).toEqual(true);
+ jQuery.fx.off = false;
});
it('returns the currently selected model instance when calling getModelForFile', function() {
var $tr = fileList.findFileEl('One.txt');
@@ -2088,12 +2090,14 @@ describe('OCA.Files.FileList tests', function() {
expect(model3).toEqual(model1);
});
it('closes the sidebar when switching folders', function() {
+ jQuery.fx.off = true;
var $tr = fileList.findFileEl('One.txt');
$tr.find('td.filename>a.name').click();
expect($('#app-sidebar').hasClass('disappear')).toEqual(false);
fileList.changeDirectory('/another');
expect($('#app-sidebar').hasClass('disappear')).toEqual(true);
+ jQuery.fx.off = false;
});
});
describe('File actions', function() {