Skip to content

Commit 54bc9a0

Browse files
Fix firestore tests
1 parent b623b75 commit 54bc9a0

File tree

5 files changed

+7
-9
lines changed

5 files changed

+7
-9
lines changed

docs/modules/cassandra.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ npm install @testcontainers/cassandra --save-dev
2121
<!--/codeinclude-->
2222

2323
<!--codeinclude-->
24-
[With custom datacenter / rack](../../packages/modules/cassandra/src/cassandra-container.test.ts) inside_block:customDataSenterAndRack
24+
[With custom datacenter / rack](../../packages/modules/cassandra/src/cassandra-container.test.ts) inside_block:customDataCenterAndRack
2525
<!--/codeinclude-->
2626

2727
<!--codeinclude-->

packages/modules/cassandra/src/cassandra-container.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ describe.sequential("Cassandra", { timeout: 240_000 }, () => {
5050
});
5151
// }
5252

53-
// customDataSenterAndRack {
53+
// customDataCenterAndRack {
5454
it("should set datacenter and rack", async () => {
5555
const customDataCenter = "customDC";
5656
const customRack = "customRack";

packages/modules/gcloud/src/firestore-emulator-container.test.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
import admin from "firebase-admin";
2+
import { randomUuid } from "testcontainers";
23
import { getImage } from "../../../testcontainers/src/utils/test-helper";
34
import { FirestoreEmulatorContainer, StartedFirestoreEmulatorContainer } from "./firestore-emulator-container";
45

56
const IMAGE = getImage(__dirname);
67

78
describe("FirestoreEmulatorContainer", { timeout: 240_000 }, () => {
8-
afterEach(async () => {
9-
await admin.app().delete();
10-
});
11-
129
// firestore4 {
1310
it("should work using default version", async () => {
1411
const firestoreEmulatorContainer = await new FirestoreEmulatorContainer(IMAGE).start();
@@ -35,10 +32,11 @@ describe("FirestoreEmulatorContainer", { timeout: 240_000 }, () => {
3532
async function checkFirestore(firestoreEmulatorContainer: StartedFirestoreEmulatorContainer) {
3633
expect(firestoreEmulatorContainer).toBeDefined();
3734
const testProjectId = "test-project";
35+
const testAppName = `test-app-${randomUuid()}`;
3836
const testCollection = "test-collection";
3937
const testDocument = "test-doc";
4038
const firebaseConfig = { projectId: testProjectId };
41-
const firestore = admin.initializeApp(firebaseConfig).firestore();
39+
const firestore = admin.initializeApp(firebaseConfig, testAppName).firestore();
4240
firestore.settings({ host: firestoreEmulatorContainer.getEmulatorEndpoint(), ssl: false });
4341

4442
const docRef = firestore.collection(testCollection).doc(testDocument);

packages/testcontainers/src/common/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ export { IntervalRetry, Retry } from "./retry";
55
export { streamToString } from "./streams";
66
export * from "./time";
77
export * from "./type-guards";
8-
export { RandomUuid, Uuid } from "./uuid";
8+
export { RandomUuid, Uuid, randomUuid } from "./uuid";

packages/testcontainers/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export { IntervalRetry, RandomUuid, Retry, Uuid, log } from "./common";
1+
export { IntervalRetry, RandomUuid, Retry, Uuid, log, randomUuid } from "./common";
22
export { ContainerRuntimeClient, ImageName, getContainerRuntimeClient } from "./container-runtime";
33
export { DockerComposeEnvironment } from "./docker-compose-environment/docker-compose-environment";
44
export { DownedDockerComposeEnvironment } from "./docker-compose-environment/downed-docker-compose-environment";

0 commit comments

Comments
 (0)