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

Convert away from `Promise.defer`

test/app-tests/loading.js

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