Skip to content

Commit f321aba

Browse files
committed
Convert away from Promise.defer
`Promise.defer` is deprecated in Bluebird and it logs loudly each time it's called. This cleans up testing logs significantly by converting away from it.
1 parent 7ac117f commit f321aba

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

test/app-tests/loading.js

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,6 @@ describe('loading:', function() {
123123
toString: function() { return this.search + this.hash; },
124124
};
125125

126-
const tokenLoginCompleteDefer = Promise.defer();
127-
tokenLoginCompletePromise = tokenLoginCompleteDefer.promise;
128-
129126
function onNewScreen(screen) {
130127
console.log(Date.now() + " newscreen "+screen);
131128
const hash = '#/' + screen;
@@ -157,18 +154,21 @@ describe('loading:', function() {
157154
PlatformPeg.set(new WebPlatform());
158155

159156
const params = parseQs(windowLocation);
160-
matrixChat = ReactDOM.render(
161-
<MatrixChat
162-
onNewScreen={onNewScreen}
163-
config={config}
164-
realQueryParams={params}
165-
startingFragmentQueryParams={fragParts.params}
166-
enableGuest={true}
167-
onTokenLoginCompleted={() => tokenLoginCompleteDefer.resolve()}
168-
initialScreenAfterLogin={getScreenFromLocation(windowLocation)}
169-
makeRegistrationUrl={() => {throw new Error('Not implemented');}}
170-
/>, parentDiv,
171-
);
157+
158+
tokenLoginCompletePromise = new Promise(resolve => {
159+
matrixChat = ReactDOM.render(
160+
<MatrixChat
161+
onNewScreen={onNewScreen}
162+
config={config}
163+
realQueryParams={params}
164+
startingFragmentQueryParams={fragParts.params}
165+
enableGuest={true}
166+
onTokenLoginCompleted={resolve}
167+
initialScreenAfterLogin={getScreenFromLocation(windowLocation)}
168+
makeRegistrationUrl={() => {throw new Error('Not implemented');}}
169+
/>, parentDiv,
170+
);
171+
});
172172
}
173173

174174
// set an expectation that we will get a call to /sync, then flush

0 commit comments

Comments
 (0)