summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing/tests/js
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2014-06-27 15:03:21 +0200
committerMorris Jobke <hey@morrisjobke.de>2014-06-27 15:03:21 +0200
commit3b2fd5e4e6aad769f656c473f1a1fe53f5936c47 (patch)
tree5e75f4c443c3590f2086b2088f2e0c623ca547a1 /apps/files_sharing/tests/js
parentb975f0e7184f769d9bc857c1e6db90006b45e2c8 (diff)
parent586b3a9683421181b7cd66aff2d3fabd0f34531e (diff)
downloadnextcloud-server-3b2fd5e4e6aad769f656c473f1a1fe53f5936c47.tar.gz
nextcloud-server-3b2fd5e4e6aad769f656c473f1a1fe53f5936c47.zip
Merge pull request #9254 from owncloud/fileactions-deferred
Sync file list with file actions
Diffstat (limited to 'apps/files_sharing/tests/js')
-rw-r--r--apps/files_sharing/tests/js/appSpec.js2
-rw-r--r--apps/files_sharing/tests/js/shareSpec.js2
-rw-r--r--apps/files_sharing/tests/js/sharedfilelistSpec.js1
3 files changed, 5 insertions, 0 deletions
diff --git a/apps/files_sharing/tests/js/appSpec.js b/apps/files_sharing/tests/js/appSpec.js
index 9c46b7caf1b..d0480ad1aa4 100644
--- a/apps/files_sharing/tests/js/appSpec.js
+++ b/apps/files_sharing/tests/js/appSpec.js
@@ -47,6 +47,8 @@ describe('OCA.Sharing.App tests', function() {
afterEach(function() {
App._inFileList = null;
App._outFileList = null;
+ fileListIn.destroy();
+ fileListOut.destroy();
fileListIn = null;
fileListOut = null;
});
diff --git a/apps/files_sharing/tests/js/shareSpec.js b/apps/files_sharing/tests/js/shareSpec.js
index 455addaccc0..3d4fc754821 100644
--- a/apps/files_sharing/tests/js/shareSpec.js
+++ b/apps/files_sharing/tests/js/shareSpec.js
@@ -70,6 +70,8 @@ describe('OCA.Sharing.Util tests', function() {
OCA.Files.FileList.prototype = oldFileListPrototype;
delete OCA.Sharing.sharesLoaded;
delete OC.Share.droppedDown;
+ fileList.destroy();
+ fileList = null;
OC.Share.statuses = {};
OC.Share.currentShares = {};
});
diff --git a/apps/files_sharing/tests/js/sharedfilelistSpec.js b/apps/files_sharing/tests/js/sharedfilelistSpec.js
index 0f6d0a0ba49..4e130885500 100644
--- a/apps/files_sharing/tests/js/sharedfilelistSpec.js
+++ b/apps/files_sharing/tests/js/sharedfilelistSpec.js
@@ -55,6 +55,7 @@ describe('OCA.Sharing.FileList tests', function() {
afterEach(function() {
OCA.Files.FileList.prototype = oldFileListPrototype;
testFiles = undefined;
+ fileList.destroy();
fileList = undefined;
fileActions = undefined;