summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2020-04-21 09:47:05 +0200
committerJulius Härtl <jus@bitgrid.net>2020-04-23 19:12:54 +0200
commit84330f1d36e885c60135a8a7a5874048c33ed4b4 (patch)
tree95995774bf73a0e782d24626fcc9d7cddc1bce21
parent9e7f8b85dd12de07986f44ac3d874bd035d86ef6 (diff)
downloadnextcloud-server-84330f1d36e885c60135a8a7a5874048c33ed4b4.tar.gz
nextcloud-server-84330f1d36e885c60135a8a7a5874048c33ed4b4.zip
Add config fallback for legacy tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
-rw-r--r--core/src/session-heartbeat.js9
1 files changed, 8 insertions, 1 deletions
diff --git a/core/src/session-heartbeat.js b/core/src/session-heartbeat.js
index 4678982d599..cf358bc35a1 100644
--- a/core/src/session-heartbeat.js
+++ b/core/src/session-heartbeat.js
@@ -25,9 +25,16 @@ import { loadState } from '@nextcloud/initial-state'
import { getCurrentUser } from '@nextcloud/auth'
import { generateUrl } from './OC/routing'
+import OC from './OC'
import { setToken as setRequestToken, getToken as getRequestToken } from './OC/requesttoken'
-const config = loadState('core', 'config')
+let config
+try {
+ config = loadState('core', 'config')
+} catch (e) {
+ // This fallback is just for our legacy jsunit tests since we have no way to mock loadState calls
+ config = OC.config
+}
/**
* session heartbeat (defaults to enabled)