Skip to content

Commit 27ba22c

Browse files
Feiyang1Feiyang1
committed
address comments
1 parent 943e0e5 commit 27ba22c

File tree

13 files changed

+40
-46
lines changed

13 files changed

+40
-46
lines changed

‎packages/analytics/testing/get-fake-firebase-services.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ export function getFakeInstallations(
4444
fid: string = 'fid-1234'
4545
): FirebaseInstallations {
4646
return {
47-
getId: () => Promise.resolve(fid),
48-
getToken: () => Promise.resolve('authToken'),
49-
delete: () => Promise.resolve()
47+
getId: async () => fid,
48+
getToken: async () => 'authToken',
49+
delete: async () => undefined
5050
};
5151
}

‎packages/database/test/helpers/util.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ let numDatabases = 0;
5757
new Component(
5858
'auth-internal',
5959
() => ({
60-
getToken: () => Promise.resolve(null),
60+
getToken: async () => null,
6161
addAuthTokenListener: () => {},
6262
removeAuthTokenListener: () => {},
6363
getUid: () => null

‎packages/firestore/test/unit/local/remote_document_cache.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,9 @@ describe('IndexedDbRemoteDocumentCache', () => {
175175
);
176176
});
177177

178-
genericRemoteDocumentCacheTests(() => Promise.resolve(cache));
178+
genericRemoteDocumentCacheTests(async () => cache);
179179

180-
lruRemoteDocumentCacheTests(() => Promise.resolve(cache));
180+
lruRemoteDocumentCacheTests(async () => cache);
181181
});
182182

183183
function eagerRemoteDocumentCacheTests(

‎packages/functions/test/browser/callable.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ describe('Firebase Functions > Call', () => {
4545
it('instance id', async () => {
4646
// mock firebase messaging
4747
const messagingMock: FirebaseMessaging = ({
48-
getToken: () => Promise.resolve('iid')
48+
getToken: async () => 'iid'
4949
} as unknown) as FirebaseMessaging;
5050
const messagingProvider = new Provider<FirebaseMessagingName>(
5151
'messaging',

‎packages/functions/test/callable.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ describe('Firebase Functions > Call', () => {
101101
it('token', async () => {
102102
// mock auth-internal service
103103
const authMock: FirebaseAuthInternal = ({
104-
getToken: () => Promise.resolve({ accessToken: 'token' })
104+
getToken: async () => ({ accessToken: 'token' })
105105
} as unknown) as FirebaseAuthInternal;
106106
const authProvider = new Provider<FirebaseAuthInternalName>(
107107
'auth-internal',

‎packages/messaging/src/controllers/window-controller.ts

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ export class WindowController extends BaseController {
280280
setupSWMessageListener_(): void {
281281
navigator.serviceWorker.addEventListener(
282282
'message',
283-
event => {
283+
async event => {
284284
if (
285285
!event.data ||
286286
!event.data.firebaseMessagingType ||
@@ -308,23 +308,17 @@ export class WindowController extends BaseController {
308308
// This message has a campaign id, meaning it was sent using the FN Console.
309309
// Analytics is enabled on this message, so we should log it.
310310
const eventType = getEventType(firebaseMessagingType);
311-
this.services.analyticsProvider.get().then(
312-
analytics => {
313-
analytics.logEvent(
314-
eventType,
315-
/* eslint-disable camelcase */
316-
{
317-
message_name: data[FN_CAMPAIGN_NAME],
318-
message_id: data[FN_CAMPAIGN_ID],
319-
message_time: data[FN_CAMPAIGN_TIME],
320-
message_device_time: Math.floor(Date.now() / 1000)
321-
}
322-
/* eslint-enable camelcase */
323-
);
324-
},
325-
() => {
326-
/* it will never reject */
311+
const analytics = await this.services.analyticsProvider.get();
312+
analytics.logEvent(
313+
eventType,
314+
/* eslint-disable camelcase */
315+
{
316+
message_name: data[FN_CAMPAIGN_NAME],
317+
message_id: data[FN_CAMPAIGN_ID],
318+
message_time: data[FN_CAMPAIGN_TIME],
319+
message_device_time: Math.floor(Date.now() / 1000)
327320
}
321+
/* eslint-enable camelcase */
328322
);
329323
}
330324
},

‎packages/messaging/test/controller-get-token.test.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,8 @@ describe('Firebase Messaging > *Controller.getToken()', () => {
199199
details = EXAMPLE_TOKEN_DETAILS_CUSTOM_VAPID;
200200
}
201201

202-
stub(serviceClass.prototype, 'getPublicVapidKey_').callsFake(() =>
203-
Promise.resolve(vapidKeyToUse)
202+
stub(serviceClass.prototype, 'getPublicVapidKey_').callsFake(
203+
async () => vapidKeyToUse
204204
);
205205

206206
stub(BaseController.prototype, 'getNotificationPermission_').callsFake(
@@ -210,7 +210,7 @@ describe('Firebase Messaging > *Controller.getToken()', () => {
210210
stub(
211211
TokenDetailsModel.prototype,
212212
'getTokenDetailsFromSWScope'
213-
).callsFake(() => Promise.resolve(details));
213+
).callsFake(async () => details);
214214

215215
const serviceInstance = new serviceClass(firebaseInternalServices);
216216
const token = await serviceInstance.getToken();
@@ -237,7 +237,7 @@ describe('Firebase Messaging > *Controller.getToken()', () => {
237237
stub(
238238
TokenDetailsModel.prototype,
239239
'getTokenDetailsFromSWScope'
240-
).callsFake(() => Promise.resolve(EXAMPLE_TOKEN_DETAILS_CUSTOM_VAPID));
240+
).callsFake(async () => EXAMPLE_TOKEN_DETAILS_CUSTOM_VAPID);
241241

242242
const serviceInstance = new serviceClass(firebaseInternalServices);
243243
const token = await serviceInstance.getToken();
@@ -258,7 +258,7 @@ describe('Firebase Messaging > *Controller.getToken()', () => {
258258
stub(
259259
TokenDetailsModel.prototype,
260260
'getTokenDetailsFromSWScope'
261-
).callsFake(() => Promise.resolve(EXAMPLE_EXPIRED_TOKEN_DETAILS));
261+
).callsFake(async () => EXAMPLE_EXPIRED_TOKEN_DETAILS);
262262

263263
stub(serviceClass.prototype, 'getPublicVapidKey_').callsFake(() =>
264264
Promise.resolve(DEFAULT_PUBLIC_VAPID_KEY)
@@ -328,7 +328,7 @@ describe('Firebase Messaging > *Controller.getToken()', () => {
328328
stub(
329329
TokenDetailsModel.prototype,
330330
'getTokenDetailsFromSWScope'
331-
).callsFake(() => Promise.resolve(undefined));
331+
).callsFake(async () => undefined);
332332

333333
const saveTokenDetailsStub = stub(
334334
TokenDetailsModel.prototype,
@@ -425,7 +425,7 @@ describe('Firebase Messaging > *Controller.getToken()', () => {
425425
stub(
426426
TokenDetailsModel.prototype,
427427
'getTokenDetailsFromSWScope'
428-
).callsFake(() => Promise.resolve(details));
428+
).callsFake(async () => details);
429429

430430
const serviceInstance = new serviceClass(firebaseInternalServices);
431431
const token = await serviceInstance.getToken();
@@ -472,7 +472,7 @@ describe('Firebase Messaging > *Controller.getToken()', () => {
472472
stub(
473473
TokenDetailsModel.prototype,
474474
'getTokenDetailsFromSWScope'
475-
).callsFake(() => Promise.resolve(EXAMPLE_TOKEN_DETAILS_DEFAULT_VAPID));
475+
).callsFake(async () => EXAMPLE_TOKEN_DETAILS_DEFAULT_VAPID);
476476

477477
stub(serviceClass.prototype, 'getPushSubscription').callsFake(() =>
478478
Promise.resolve(subscription)
@@ -488,7 +488,7 @@ describe('Firebase Messaging > *Controller.getToken()', () => {
488488
const GET_TOKEN_RESPONSE = EXAMPLE_TOKEN_DETAILS_CUSTOM_VAPID.fcmToken;
489489

490490
// now update the VAPID key.
491-
getPublicVapidKeyStub.callsFake(() => Promise.resolve(CUSTOM_VAPID_KEY));
491+
getPublicVapidKeyStub.callsFake(async () => CUSTOM_VAPID_KEY);
492492

493493
const saveTokenDetailsStub = stub(
494494
TokenDetailsModel.prototype,
@@ -535,7 +535,7 @@ describe('Firebase Messaging > *Controller.getToken()', () => {
535535
stub(
536536
TokenDetailsModel.prototype,
537537
'getTokenDetailsFromSWScope'
538-
).callsFake(() => Promise.resolve(EXAMPLE_EXPIRED_TOKEN_DETAILS));
538+
).callsFake(async () => EXAMPLE_EXPIRED_TOKEN_DETAILS);
539539

540540
stub(serviceClass.prototype, 'getPushSubscription').callsFake(() =>
541541
Promise.resolve(subscription)

‎packages/messaging/test/testing-utils/make-fake-firebase-services.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ export function makeFakeApp(options: FirebaseOptions = {}): FirebaseApp {
5454

5555
export function makeFakeInstallations(): FirebaseInstallations {
5656
return {
57-
getId: () => Promise.resolve('FID'),
58-
getToken: () => Promise.resolve('authToken'),
59-
delete: () => Promise.resolve()
57+
getId: async () => 'FID',
58+
getToken: async () => 'authToken',
59+
delete: async () => undefined
6060
};
6161
}
6262

‎packages/remote-config/test/client/rest_client.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ describe('RestClient', () => {
5454
});
5555

5656
describe('fetch', () => {
57-
let fetchStub: sinon.SinonStub;
57+
let fetchStub: sinon.SinonStub<[RequestInfo, RequestInit?], Promise<Response>>;
5858

5959
beforeEach(() => {
6060
fetchStub = sinon
@@ -185,7 +185,7 @@ describe('RestClient', () => {
185185
Promise.resolve({
186186
status: 200,
187187
headers: new Headers({ ETag: 'etag' }),
188-
json: () => Promise.resolve({ state: 'INSTANCE_STATE_UNSPECIFIED' })
188+
json: async () => ({ state: 'INSTANCE_STATE_UNSPECIFIED' })
189189
} as Response)
190190
);
191191

@@ -205,7 +205,7 @@ describe('RestClient', () => {
205205
Promise.resolve({
206206
status: 200,
207207
headers: new Headers({ ETag: 'etag' }),
208-
json: () => Promise.resolve({ state: 'NO_CHANGE' })
208+
json: async () => ({ state: 'NO_CHANGE' })
209209
} as Response)
210210
);
211211

@@ -224,7 +224,7 @@ describe('RestClient', () => {
224224
Promise.resolve({
225225
status: 200,
226226
headers: new Headers({ ETag: 'etag' }),
227-
json: () => Promise.resolve({ state })
227+
json: async () => ({ state })
228228
} as Response)
229229
);
230230

‎packages/remote-config/test/remote_config.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ describe('RemoteConfig', () => {
423423
});
424424

425425
describe('fetch', () => {
426-
let timeoutStub: sinon.SinonStub;
426+
let timeoutStub: sinon.SinonStub<[(...args: any[]) => void, number, ...any[]]>;
427427
beforeEach(() => {
428428
client.fetch = sinon
429429
.stub()

‎packages/storage/test/requests.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ describe('Firebase Storage > Requests', () => {
6060
[CONFIG_STORAGE_BUCKET_KEY]: 'fredzqm-staging'
6161
},
6262
automaticDataCollectionEnabled: false,
63-
delete: () => Promise.resolve()
63+
delete: async () => undefined
6464
};
6565

6666
const authWrapper = new AuthWrapper(

‎packages/storage/test/testshared.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export function makeFakeAuthProvider(
6363
new Component(
6464
'auth-internal',
6565
() => ({
66-
getToken: () => Promise.resolve(token)
66+
getToken: async () => token
6767
}),
6868
ComponentType.PRIVATE
6969
)

‎packages/testing/src/api/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ function initializeApp(
133133
'auth-internal',
134134
() =>
135135
({
136-
getToken: () => Promise.resolve({ accessToken: accessToken }),
136+
getToken: async () => ({ accessToken: accessToken }),
137137
getUid: () => null,
138138
addAuthTokenListener: () => {},
139139
removeAuthTokenListener: () => {}

0 commit comments

Comments
 (0)