gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2017-06-19 10:38:05 +00:00
parent 45bb74d8f6 07103431a9
commit 9eca0d2fde
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/app-tests/loading.js
View File

@ -49,7 +49,7 @@ describe('loading:', function () {
let matrixChat;
// a promise which resolves when the MatrixChat calls onTokenLoginCompleted
let loadCompletePromise;
let tokenLoginCompletePromise;
beforeEach(function() {
test_utils.beforeEach(this);
@ -100,8 +100,8 @@ describe('loading:', function () {
toString: function() { return this.search + this.hash; },
};
let loadCompleteDefer = q.defer();
loadCompletePromise = loadCompleteDefer.promise;
let tokenLoginCompleteDefer = q.defer();
tokenLoginCompletePromise = tokenLoginCompleteDefer.promise;
function onNewScreen(screen) {
console.log(Date.now() + " newscreen "+screen);
@ -136,7 +136,7 @@ describe('loading:', function () {
realQueryParams={params}
startingFragmentQueryParams={fragParts.params}
enableGuest={true}
onTokenLoginCompleted={loadCompleteDefer.resolve}
onTokenLoginCompleted={tokenLoginCompleteDefer.resolve}
initialScreenAfterLogin={getScreenFromLocation(windowLocation)}
makeRegistrationUrl={() => {throw new Error('Not implemented');}}
/>, parentDiv
@ -522,7 +522,7 @@ describe('loading:', function () {
// simulate the reload - just check that things are left in the
// right state for the reloaded app.
return loadCompletePromise;
return tokenLoginCompletePromise;
}).then(() => {
// check that the localstorage has been set up in such a way that
// the reloaded app can pick up where we leave off.