Skip to content

Commit 2da0c6e

Browse files
author
Lauren Long
committed
Save old env variables during init not during class construction
1 parent b5683c3 commit 2da0c6e

File tree

2 files changed

+16
-6
lines changed

2 files changed

+16
-6
lines changed

spec/lifecycle.spec.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,13 @@ describe('lifecycle', () => {
5959
});
6060

6161
describe('#cleanUp', () => {
62+
beforeEach(() => {
63+
delete process.env.FIREBASE_CONFIG;
64+
delete process.env.GCLOUD_PROJECT;
65+
delete process.env.GOOGLE_APPLICATION_CREDENTIALS;
66+
delete process.env.CLOUD_RUNTIME_CONFIG;
67+
});
68+
6269
afterEach(() => {
6370
delete process.env.FIREBASE_CONFIG;
6471
delete process.env.GCLOUD_PROJECT;

src/lifecycle.ts

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,7 @@ export class FirebaseFunctionsTest {
3030
private _oldEnv: { [key: string]: string };
3131

3232
constructor() {
33-
this._oldEnv = {
34-
FIREBASE_CONFIG: process.env.FIREBASE_CONFIG,
35-
GOOGLE_APPLICATION_CREDENTIALS: process.env.GOOGLE_APPLICATION_CREDENTIALS,
36-
GCLOUD_PROJECT: process.env.GCLOUD_PROJECT,
37-
CLOUD_RUNTIME_CONFIG: process.env.CLOUD_RUNTIME_CONFIG,
38-
};
33+
this._oldEnv = {};
3934
}
4035

4136
/** Initialize the SDK. */
@@ -50,6 +45,14 @@ export class FirebaseFunctionsTest {
5045
/** Path to a service account key file to be used when initializing the Firebase app. */
5146
pathToServiceAccountKey?: string,
5247
) {
48+
49+
this._oldEnv = {
50+
FIREBASE_CONFIG: process.env.FIREBASE_CONFIG,
51+
GOOGLE_APPLICATION_CREDENTIALS: process.env.GOOGLE_APPLICATION_CREDENTIALS,
52+
GCLOUD_PROJECT: process.env.GCLOUD_PROJECT,
53+
CLOUD_RUNTIME_CONFIG: process.env.CLOUD_RUNTIME_CONFIG,
54+
};
55+
5356
if (isEmpty(firebaseConfig)) {
5457
process.env.FIREBASE_CONFIG = JSON.stringify({
5558
databaseURL: 'https://not-a-project.firebaseio.com',

0 commit comments

Comments
 (0)