Skip to content

Commit 62facfc

Browse files
committed
Fix test, put function version component back
1 parent 70df5d6 commit 62facfc

File tree

2 files changed

+21
-12
lines changed

2 files changed

+21
-12
lines changed

packages/app/test/platformLogger.test.ts

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,27 +28,35 @@ import {
2828
} from '@firebase/component';
2929
import { VersionService } from '../src/version-service';
3030

31+
declare module "@firebase/component" {
32+
interface NameServiceMapping {
33+
'vs1': VersionService;
34+
'vs2': VersionService;
35+
'test-shell': Promise<void>;
36+
}
37+
}
38+
3139
describe('Platform Logger Service Unit Tests', () => {
3240
it(`logs core version`, () => {
3341
const container = new ComponentContainer('testContainer');
3442
container.addComponent(
3543
new Component(
36-
'comp1',
37-
() => new VersionService('comp1', '1.2.3'),
44+
'vs1',
45+
() => new VersionService('vs1', '1.2.3'),
3846
ComponentType.VERSION
3947
)
4048
);
4149
container.addComponent(
4250
new Component(
43-
'comp2',
44-
() => new VersionService('comp2', '3.02.01'),
51+
'vs2',
52+
() => new VersionService('vs2', '3.02.01'),
4553
ComponentType.VERSION
4654
)
4755
);
4856
const platformLoggerService = new PlatformLoggerService(container);
4957
const platformInfoString = platformLoggerService.getPlatformInfoString();
50-
expect(platformInfoString).to.include('comp1/1.2.3');
51-
expect(platformInfoString).to.include('comp2/3.02.01');
58+
expect(platformInfoString).to.include('vs1/1.2.3');
59+
expect(platformInfoString).to.include('vs2/3.02.01');
5260
});
5361
});
5462

@@ -63,20 +71,19 @@ describe('Platform Logger Service Integration Tests', () => {
6371
firebase.initializeApp({});
6472
(firebase as _FirebaseNamespace).INTERNAL.registerComponent(
6573
new Component(
66-
'test',
74+
'test-shell',
6775
async (container: ComponentContainer) => {
6876
const platformLoggerProvider = container.getProvider(
6977
'platform-logger'
7078
);
7179
const platformLogger = (await platformLoggerProvider.get()) as PlatformLoggerService;
7280
const platformInfoString = platformLogger.getPlatformInfoString();
7381
expect(platformInfoString).to.include('fire-core');
74-
return {};
7582
},
7683
ComponentType.PUBLIC
7784
)
7885
);
79-
(firebase as any).test();
86+
(firebase as any)['test-shell']();
8087
});
8188

8289
it(`logs other components' versions`, () => {
@@ -87,19 +94,18 @@ describe('Platform Logger Service Integration Tests', () => {
8794
);
8895
(firebase as _FirebaseNamespace).INTERNAL.registerComponent(
8996
new Component(
90-
'test',
97+
'test-shell',
9198
async (container: ComponentContainer) => {
9299
const platformLoggerProvider = container.getProvider(
93100
'platform-logger'
94101
);
95102
const platformLogger = (await platformLoggerProvider.get()) as PlatformLoggerService;
96103
const platformInfoString = platformLogger.getPlatformInfoString();
97104
expect(platformInfoString).to.include('fire-analytics/1.2.3');
98-
return {};
99105
},
100106
ComponentType.PUBLIC
101107
)
102108
);
103-
(firebase as any).test();
109+
(firebase as any)['test-shell']();
104110
});
105111
});

packages/functions/src/config.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ import {
2323
} from '@firebase/component';
2424
import { _FirebaseNamespace } from '@firebase/app-types/private';
2525

26+
import { version } from '../package.json';
27+
2628
/**
2729
* Type constant for Firebase Functions.
2830
*/
@@ -48,4 +50,5 @@ export function registerFunctions(instance: _FirebaseNamespace): void {
4850
.setServiceProps(namespaceExports)
4951
.setMultipleInstances(true)
5052
);
53+
instance.INTERNAL.registerVersionComponent('functions', version);
5154
}

0 commit comments

Comments
 (0)