summaryrefslogtreecommitdiffstats
path: root/apps/files
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2014-09-17 18:10:49 +0200
committerLukas Reschke <lukas@owncloud.com>2014-09-17 18:10:49 +0200
commit7db0d5512910e768912f615cb408677e38735d91 (patch)
treef422b8f8581cf45d150cdd529b79606477dc1185 /apps/files
parentef0a0f5f87f88ff19d6f2234f7669914881e8b1a (diff)
parent05cf940983bed37b9b29b496dbd3dea073fe21ee (diff)
downloadnextcloud-server-7db0d5512910e768912f615cb408677e38735d91.tar.gz
nextcloud-server-7db0d5512910e768912f615cb408677e38735d91.zip
Merge pull request #11105 from owncloud/jsunit-legacyfileactionsfix
Tentative fix for legacy file actions unit test side effect
Diffstat (limited to 'apps/files')
-rw-r--r--apps/files/tests/js/appSpec.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/files/tests/js/appSpec.js b/apps/files/tests/js/appSpec.js
index 77d36d59fa9..dce513339f0 100644
--- a/apps/files/tests/js/appSpec.js
+++ b/apps/files/tests/js/appSpec.js
@@ -23,6 +23,7 @@ describe('OCA.Files.App tests', function() {
var App = OCA.Files.App;
var pushStateStub;
var parseUrlQueryStub;
+ var oldLegacyFileActions;
beforeEach(function() {
$('#testArea').append(
@@ -41,6 +42,7 @@ describe('OCA.Files.App tests', function() {
'</div>'
);
+ oldLegacyFileActions = window.FileActions;
window.FileActions = new OCA.Files.FileActions();
OCA.Files.legacyFileActions = window.FileActions;
OCA.Files.fileActions = new OCA.Files.FileActions();
@@ -54,6 +56,8 @@ describe('OCA.Files.App tests', function() {
afterEach(function() {
App.destroy();
+ window.FileActions = oldLegacyFileActions;
+
pushStateStub.restore();
parseUrlQueryStub.restore();
});