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

Merge pull request #9278 from jryans/storage-edge-cases 

Convert away from `Promise.defer`
This commit is contained in:
J. Ryan Stinnett 2019-03-26 13:26:00 +00:00 committed by GitHub
parent 7ac117f964 f321aba4ac
commit 2e24b0c53b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,9 +123,6 @@ describe('loading:', function() {
toString: function() { return this.search + this.hash; }, toString: function() { return this.search + this.hash; },
}; };
const tokenLoginCompleteDefer = Promise.defer();
tokenLoginCompletePromise = tokenLoginCompleteDefer.promise;
function onNewScreen(screen) { function onNewScreen(screen) {
console.log(Date.now() + " newscreen "+screen); console.log(Date.now() + " newscreen "+screen);
const hash = '#/' + screen; const hash = '#/' + screen;
@ -157,18 +154,21 @@ describe('loading:', function() {
PlatformPeg.set(new WebPlatform()); PlatformPeg.set(new WebPlatform());
const params = parseQs(windowLocation); const params = parseQs(windowLocation);
matrixChat = ReactDOM.render(
<MatrixChat tokenLoginCompletePromise = new Promise(resolve => {
onNewScreen={onNewScreen} matrixChat = ReactDOM.render(
config={config} <MatrixChat
realQueryParams={params} onNewScreen={onNewScreen}
startingFragmentQueryParams={fragParts.params} config={config}
enableGuest={true} realQueryParams={params}
onTokenLoginCompleted={() => tokenLoginCompleteDefer.resolve()} startingFragmentQueryParams={fragParts.params}
initialScreenAfterLogin={getScreenFromLocation(windowLocation)} enableGuest={true}
makeRegistrationUrl={() => {throw new Error('Not implemented');}} onTokenLoginCompleted={resolve}
/>, parentDiv, initialScreenAfterLogin={getScreenFromLocation(windowLocation)}
); makeRegistrationUrl={() => {throw new Error('Not implemented');}}
/>, parentDiv,
);
});
} }
// set an expectation that we will get a call to /sync, then flush // set an expectation that we will get a call to /sync, then flush