Skip to content

Commit b4771e2

Browse files
committed
Used utility function
1 parent 96ca94a commit b4771e2

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

packages/database-compat/test/helpers/util.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import '../../src/index';
2222
import firebase from '@firebase/app-compat';
2323
import { _FirebaseNamespace } from '@firebase/app-types/private';
2424
import { Component, ComponentType } from '@firebase/component';
25+
import { Deferred } from '@firebase/util';
2526

2627
import { Path } from '../../../database/src/core/util/Path';
2728
import { Query, Reference } from '../../src/api/Reference';
@@ -175,3 +176,11 @@ export function canCreateExtraConnections() {
175176
typeof MozWebSocket !== 'undefined' || typeof WebSocket !== 'undefined'
176177
);
177178
}
179+
180+
// TODO: Move this to @firebase/util
181+
export function timeoutResolve<T>(promise: Promise<T>, timeInMS = 2000) {
182+
const deferredPromise = new Deferred<T>();
183+
setTimeout(() => deferredPromise.reject('timeout!'), timeInMS);
184+
promise.then(deferredPromise.resolve, deferredPromise.reject);
185+
return deferredPromise.promise;
186+
}

packages/database-compat/test/query.test.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import {
2929
} from '../../database/test/helpers/EventAccumulator';
3030
import { DataSnapshot, Query, Reference } from '../src/api/Reference';
3131

32-
import { getFreshRepo, getPath, getRandomNode, pause } from './helpers/util';
32+
import { getFreshRepo, getPath, getRandomNode, pause, timeoutResolve } from './helpers/util';
3333

3434
use(chaiAsPromised);
3535

@@ -3226,10 +3226,7 @@ describe('Query Tests', () => {
32263226
const node = getRandomNode() as Reference;
32273227
node.database.goOffline();
32283228
try {
3229-
const getPromise = new Promise((resolve, reject) => {
3230-
setTimeout(reject, 2000);
3231-
node.get().then(resolve);
3232-
});
3229+
const getPromise = timeoutResolve(node.get());
32333230
await expect(getPromise).to.eventually.be.rejected;
32343231
} finally {
32353232
node.database.goOnline();

0 commit comments

Comments
 (0)