summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2015-03-20 14:17:32 +0100
committerVincent Petry <pvince81@owncloud.com>2015-03-20 14:17:32 +0100
commite44ab2dcfed7a613af145174ee93668c931adf56 (patch)
treedd89cfce636d75f25c103238ca6c5d05bc534be5 /core
parent0b1c4bfc3bae1ece32f064d9d96527ece2cfab62 (diff)
parentc37913b1d506c0a4afe035de0e4c4fd5a80bb6ea (diff)
downloadnextcloud-server-e44ab2dcfed7a613af145174ee93668c931adf56.tar.gz
nextcloud-server-e44ab2dcfed7a613af145174ee93668c931adf56.zip
Merge pull request #11884 from owncloud/ext-appframework
Cleanup ext storage CRUD code, introduce storage config id
Diffstat (limited to 'core')
-rw-r--r--core/js/tests/specHelper.js5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/js/tests/specHelper.js b/core/js/tests/specHelper.js
index 59c2a99645f..29293e89bcb 100644
--- a/core/js/tests/specHelper.js
+++ b/core/js/tests/specHelper.js
@@ -123,6 +123,9 @@ window.isPhantom = /phantom/i.test(navigator.userAgent);
// reset plugins
OC.Plugins._plugins = [];
+
+ // dummy select2 (which isn't loaded during the tests)
+ $.fn.select2 = function() {};
});
afterEach(function() {
@@ -131,6 +134,8 @@ window.isPhantom = /phantom/i.test(navigator.userAgent);
fakeServer.restore();
$testArea.remove();
+
+ delete($.fn.select2);
});
})();