diff options
| author | Christoph Wurst <christoph@winzerhof-wurst.at> | 2019-05-02 16:03:58 +0200 |
|---|---|---|
| committer | Christoph Wurst <christoph@winzerhof-wurst.at> | 2019-05-06 17:55:30 +0200 |
| commit | 249a5dbdba0dc3628c0f3490680de61dc91aafc8 (patch) | |
| tree | 452f288909bb811146a0683b8a75c1b87932aadc /core/js/tests | |
| parent | e0c62352b71441c2f843fd5f023000af342011a8 (diff) | |
| download | nextcloud-server-249a5dbdba0dc3628c0f3490680de61dc91aafc8.tar.gz nextcloud-server-249a5dbdba0dc3628c0f3490680de61dc91aafc8.zip | |
Move oc_webroot, OC.webroot and OC.getRootPath() to the bundle
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Diffstat (limited to 'core/js/tests')
| -rw-r--r-- | core/js/tests/specHelper.js | 8 | ||||
| -rw-r--r-- | core/js/tests/specs/sharedialoglinkshareview.js | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/core/js/tests/specHelper.js b/core/js/tests/specHelper.js index 970b278089d..7dcc321f296 100644 --- a/core/js/tests/specHelper.js +++ b/core/js/tests/specHelper.js @@ -86,11 +86,11 @@ window.firstDay = 0; // setup dummy webroots /* jshint camelcase: false */ window.oc_debug = true; -// FIXME: oc_webroot is supposed to be only the path!!! -window.oc_webroot = location.href + '/'; +// FIXME: OC.webroot is supposed to be only the path!!! +OC.webroot = location.href + '/'; window.oc_appswebroots = { - "files": window.oc_webroot + '/apps/files/', - "files_sharing": window.oc_webroot + '/apps/files_sharing/' + "files": window.webroot + '/apps/files/', + "files_sharing": window.webroot + '/apps/files_sharing/' }; OC.config = { session_lifetime: 600 * 1000, diff --git a/core/js/tests/specs/sharedialoglinkshareview.js b/core/js/tests/specs/sharedialoglinkshareview.js index 9e6c67dca14..f2a64a50ff8 100644 --- a/core/js/tests/specs/sharedialoglinkshareview.js +++ b/core/js/tests/specs/sharedialoglinkshareview.js @@ -243,7 +243,7 @@ describe('OC.Share.ShareDialogLinkShareView', function () { configModel.isShareWithLinkAllowed.returns(true); // "Enable" Talk - window.oc_appswebroots['spreed'] = window.oc_webroot + '/apps/files/'; + window.oc_appswebroots['spreed'] = OC.getRootPath() + '/apps/files/'; shareModel.set({ linkShares: [{ |