Skip to content

Commit 28a22ff

Browse files
committed
PR fixes
1 parent d0ffb56 commit 28a22ff

File tree

3 files changed

+8
-19
lines changed

3 files changed

+8
-19
lines changed

src/remote-config/remote-config-api-client.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,9 +237,6 @@ export class RemoteConfigApiClient {
237237
public listVersions(options?: ListVersionsOptions): Promise<ListVersionsResult> {
238238
if (typeof options !== 'undefined') {
239239
options = this.validateListVersionsOptions(options);
240-
// Remove undefined fields from options
241-
Object.keys(options).forEach(key =>
242-
(options as any)[key] === undefined && delete (options as any)[key])
243240
}
244241
return this.getUrl()
245242
.then((url) => {
@@ -480,6 +477,10 @@ export class RemoteConfigApiClient {
480477
optionsCopy.endTime = new Date(optionsCopy.endTime).toISOString();
481478
}
482479
}
480+
// Remove undefined fields from optionsCopy
481+
Object.keys(optionsCopy).forEach(key =>
482+
(typeof (optionsCopy as any)[key] === 'undefined') && delete (optionsCopy as any)[key]
483+
);
483484
return optionsCopy;
484485
}
485486
}

src/remote-config/remote-config.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,8 @@ export class RemoteConfig implements FirebaseServiceInterface {
144144
public listVersions(options?: ListVersionsOptions): Promise<ListVersionsResult> {
145145
return this.client.listVersions(options)
146146
.then((listVersionsResponse) => {
147-
const versions = (typeof listVersionsResponse.versions == 'undefined') ? [] :
148-
listVersionsResponse.versions.map(version => new VersionImpl(version));
149147
return {
150-
versions,
148+
versions: listVersionsResponse.versions?.map(version => new VersionImpl(version)) ?? [],
151149
nextPageToken: listVersionsResponse.nextPageToken,
152150
}
153151
});

test/integration/remote-config.spec.ts

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ const VALID_CONDITIONS: admin.remoteConfig.RemoteConfigCondition[] = [
7070
},
7171
];
7272

73-
const VALID_VERSION: admin.remoteConfig.Version = {
73+
const VALID_VERSION = {
7474
description: `template description ${Date.now()}`,
7575
}
7676

@@ -149,7 +149,7 @@ describe('admin.remoteConfig', () => {
149149
});
150150

151151
describe('getTemplate', () => {
152-
it('verfy that getTemplate() returns the most recently published template', () => {
152+
it('should return the most recently published template', () => {
153153
return admin.remoteConfig().getTemplate()
154154
.then((template) => {
155155
expect(template.etag).matches(/^etag-[0-9]*-[0-9]*$/);
@@ -186,7 +186,7 @@ describe('admin.remoteConfig', () => {
186186
versionTwoNumber = activeTemplate.version!.versionNumber!;
187187
});
188188

189-
it('verfy that getTemplateAtVersion() returns the requested template version v1', () => {
189+
it('should return the requested template version v1', () => {
190190
return admin.remoteConfig().getTemplateAtVersion(versionOneNumber)
191191
.then((template) => {
192192
expect(template.etag).matches(/^etag-[0-9]*-[0-9]*$/);
@@ -195,16 +195,6 @@ describe('admin.remoteConfig', () => {
195195
expect(template.version!.description).equals(versionOneDescription);
196196
});
197197
});
198-
199-
it('verfy that getTemplateAtVersion() returns the requested template version v2', () => {
200-
return admin.remoteConfig().getTemplateAtVersion(versionTwoNumber)
201-
.then((template) => {
202-
expect(template.etag).matches(/^etag-[0-9]*-[0-9]*$/);
203-
expect(template.version).to.be.not.undefined;
204-
expect(template.version!.versionNumber).equals(versionTwoNumber);
205-
expect(template.version!.description).equals(versionTwoDescription);
206-
});
207-
});
208198
});
209199

210200
describe('listVersions', () => {

0 commit comments

Comments
 (0)