From a98ce4492c9a15e737eeb76c7182f01c68be4343 Mon Sep 17 00:00:00 2001 From: lukesmith Date: Tue, 28 Jun 2022 13:41:32 +0100 Subject: [PATCH 1/2] Include the documents path in the already exists error message --- src/driver/Firestore/InProcessFirestore.ts | 6 +++--- tests/driver/Firestore/InProcessFirestore.batch.test.ts | 2 +- .../driver/Firestore/InProcessFirestore.bulkWriter.test.ts | 2 +- tests/driver/Firestore/InProcessFirestore.create.test.ts | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/driver/Firestore/InProcessFirestore.ts b/src/driver/Firestore/InProcessFirestore.ts index 3aea9e2..c94389c 100644 --- a/src/driver/Firestore/InProcessFirestore.ts +++ b/src/driver/Firestore/InProcessFirestore.ts @@ -826,7 +826,7 @@ export class InProcessFirestoreDocRef implements IFirestoreDocRef { if (existing.exists) { throw new FirestoreError( GRPCStatusCode.ALREADY_EXISTS, - `Document already exists: ${this.path}`, + `Document already exists: /documents/${this.path}`, ) } InProcessFirestoreDocRef.validateNoUndefinedFields(data) @@ -1194,7 +1194,7 @@ class InProcessFirestoreWriteBatch implements IFirestoreWriteBatch { if ((await documentRef.get()).exists) { throw new FirestoreError( GRPCStatusCode.ALREADY_EXISTS, - `Document already exists: ${documentRef.path}`, + `Document already exists: /documents/${documentRef.path}`, ) } return documentRef.set(data) @@ -1300,7 +1300,7 @@ class InProcessFirestoreBulkWriter implements IFirestoreBulkWriter { if ((await documentRef.get()).exists) { throw new FirestoreError( GRPCStatusCode.ALREADY_EXISTS, - `Document already exists: ${documentRef.path}`, + `Document already exists: /documents/${documentRef.path}`, ) } await documentRef.set(data) diff --git a/tests/driver/Firestore/InProcessFirestore.batch.test.ts b/tests/driver/Firestore/InProcessFirestore.batch.test.ts index bb89509..bc4e300 100644 --- a/tests/driver/Firestore/InProcessFirestore.batch.test.ts +++ b/tests/driver/Firestore/InProcessFirestore.batch.test.ts @@ -150,7 +150,7 @@ describe("In-process Firestore batched writes", () => { // Then the write should fail; expect(error).isFirestoreErrorWithCode( GRPCStatusCode.ALREADY_EXISTS, - new RegExp("animals/tiger"), + new RegExp("/documents/animals/tiger"), ) // And the document should not be changed. diff --git a/tests/driver/Firestore/InProcessFirestore.bulkWriter.test.ts b/tests/driver/Firestore/InProcessFirestore.bulkWriter.test.ts index 35342f3..cd0520c 100644 --- a/tests/driver/Firestore/InProcessFirestore.bulkWriter.test.ts +++ b/tests/driver/Firestore/InProcessFirestore.bulkWriter.test.ts @@ -198,7 +198,7 @@ describe("In-process Firestore BulkWriter", () => { // Then the write should fail expect(error).isFirestoreErrorWithCode( GRPCStatusCode.ALREADY_EXISTS, - new RegExp("animals/tiger"), + new RegExp("/documents/animals/tiger"), ) // And the document should not be changed. diff --git a/tests/driver/Firestore/InProcessFirestore.create.test.ts b/tests/driver/Firestore/InProcessFirestore.create.test.ts index ff3abcf..35ff97c 100644 --- a/tests/driver/Firestore/InProcessFirestore.create.test.ts +++ b/tests/driver/Firestore/InProcessFirestore.create.test.ts @@ -45,7 +45,7 @@ describe("InProcessFirestore create", () => { // Then the write should fail; expect(error).isFirestoreErrorWithCode( GRPCStatusCode.ALREADY_EXISTS, - new RegExp("animals/tiger"), + new RegExp("/documents/animals/tiger"), ) // And the document should not be changed. From 2265fa518386f11642c6cef3786ccfc47e8b8f0a Mon Sep 17 00:00:00 2001 From: lukesmith Date: Tue, 28 Jun 2022 13:41:53 +0100 Subject: [PATCH 2/2] Bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9672738..f47eb8a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@freetrade-io/ts-firebase-driver-testing", - "version": "1.0.17", + "version": "1.0.18", "description": "Swap out Firebase as a driver for in-process testing", "main": "dist/index.js", "types": "dist/index.d.ts",