From d2643896652cec3cb690400bf6f7a1c07cc17429 Mon Sep 17 00:00:00 2001 From: aelassas Date: Sat, 16 Mar 2024 08:24:16 +0000 Subject: [PATCH] Update property.test.ts --- api/coverage/cobertura-coverage.xml | 64 ++++++++++++++--------------- api/tests/property.test.ts | 35 ++++++++++++---- 2 files changed, 59 insertions(+), 40 deletions(-) diff --git a/api/coverage/cobertura-coverage.xml b/api/coverage/cobertura-coverage.xml index aa050be9..da513bcb 100644 --- a/api/coverage/cobertura-coverage.xml +++ b/api/coverage/cobertura-coverage.xml @@ -1,6 +1,6 @@ - + C:\dev\movinin\src\api @@ -117,9 +117,9 @@ - + - + @@ -169,10 +169,10 @@ - - - - + + + + @@ -320,7 +320,7 @@ - + @@ -349,9 +349,9 @@ - + - + @@ -359,9 +359,9 @@ - + - + @@ -444,8 +444,8 @@ - - + + @@ -453,8 +453,8 @@ - - + + @@ -1038,7 +1038,7 @@ - + @@ -1184,8 +1184,8 @@ - - + + @@ -1195,27 +1195,27 @@ - - - + + + - - - + + + - + - + - - - - - + + + + + diff --git a/api/tests/property.test.ts b/api/tests/property.test.ts index 67d7ce17..b1dddc4b 100644 --- a/api/tests/property.test.ts +++ b/api/tests/property.test.ts @@ -255,7 +255,6 @@ describe('PUT /api/update-property', () => { .set(env.X_ACCESS_TOKEN, token) .send(payload) expect(res.statusCode).toBe(200) - const { images } = property property = res.body expect(property.image).toBeDefined() expect(property.images.length).toBe(0) @@ -263,27 +262,43 @@ describe('PUT /api/update-property', () => { if (!await helper.exists(mainImage)) { fs.copyFile(MAIN_IMAGE2_PATH, mainImage) } - payload.images = images + if (!await helper.exists(additionalImage1)) { + fs.copyFile(ADDITIONAL_IMAGE2_1_PATH, additionalImage1) + } + if (!await helper.exists(additionalImage2)) { + fs.copyFile(ADDITIONAL_IMAGE2_2_PATH, additionalImage2) + } + payload.images = [ADDITIONAL_IMAGE2_1, ADDITIONAL_IMAGE2_2] res = await request(app) .put('/api/update-property') .set(env.X_ACCESS_TOKEN, token) .send(payload) expect(res.statusCode).toBe(200) - if (await helper.exists(additionalImage1)) { - fs.unlink(additionalImage1) + if (!await helper.exists(mainImage)) { + fs.copyFile(MAIN_IMAGE2_PATH, mainImage) } - payload.images = [...property.images, `${uuid()}.jpg`] + payload.images = [] res = await request(app) .put('/api/update-property') .set(env.X_ACCESS_TOKEN, token) .send(payload) expect(res.statusCode).toBe(200) - if (!await helper.exists(mainImage)) { - fs.copyFile(MAIN_IMAGE2_PATH, mainImage) + if (await helper.exists(additionalImage1)) { + fs.unlink(additionalImage1) } - payload.images = [] + if (!await helper.exists(additionalImage1)) { + fs.copyFile(ADDITIONAL_IMAGE2_1_PATH, additionalImage1) + } + if (!await helper.exists(additionalImage2)) { + fs.copyFile(ADDITIONAL_IMAGE2_2_PATH, additionalImage2) + } + property = await Property.findById(PROPERTY_ID) + property.images = [ADDITIONAL_IMAGE2_1, ADDITIONAL_IMAGE2_2, `${uuid()}.jpg`] + property.image = `${uuid()}.jpg` + await property.save() + payload.images = [ADDITIONAL_IMAGE2_1, `${uuid()}.jpg`] res = await request(app) .put('/api/update-property') .set(env.X_ACCESS_TOKEN, token) @@ -297,6 +312,9 @@ describe('PUT /api/update-property', () => { .send(payload) expect(res.statusCode).toBe(204) + property = await Property.findById(PROPERTY_ID) + property.images = [] + await property.save() if (!await helper.exists(mainImage)) { fs.copyFile(MAIN_IMAGE2_PATH, mainImage) } @@ -332,6 +350,7 @@ describe('POST /api/delete-property-image/:id/:image', () => { expect(property?.images).toBeDefined() expect(property?.images?.length).toBe(2) const additionalImageName = (property?.images ?? [])[0] + console.log(additionalImageName) const additionalImagePath = path.join(env.CDN_PROPERTIES, additionalImageName) let imageExists = await helper.exists(additionalImagePath) expect(imageExists).toBeTruthy()