From c1cdb8043607cd420fca9b366babf511f142d534 Mon Sep 17 00:00:00 2001 From: Riqwan Thamir Date: Wed, 7 Dec 2022 16:03:02 +0100 Subject: [PATCH] chore: use splat instead of lodash to clone, remove unnecessary expectations --- .../api/__tests__/admin/discount.js | 7 ----- packages/medusa/src/helpers/test-request.js | 3 +-- .../medusa/src/services/__tests__/discount.js | 27 +++++++++---------- packages/medusa/src/services/discount.ts | 2 +- 4 files changed, 14 insertions(+), 25 deletions(-) diff --git a/integration-tests/api/__tests__/admin/discount.js b/integration-tests/api/__tests__/admin/discount.js index 89aca04aee..89d72acca8 100644 --- a/integration-tests/api/__tests__/admin/discount.js +++ b/integration-tests/api/__tests__/admin/discount.js @@ -1009,7 +1009,6 @@ describe("/admin/discounts", () => { }) it("fails to create a fixed discount with multiple regions", async () => { - expect.assertions(2) const api = useApi() await api @@ -1038,7 +1037,6 @@ describe("/admin/discounts", () => { }) it("fails to update a fixed discount with multiple regions", async () => { - expect.assertions(2) const api = useApi() const response = await api.post( @@ -1075,7 +1073,6 @@ describe("/admin/discounts", () => { }) it("fails to add a region to a fixed discount with an existing region", async () => { - expect.assertions(2) const api = useApi() const response = await api.post( @@ -1236,7 +1233,6 @@ describe("/admin/discounts", () => { }) it("fails to create discount with end date before start date", async () => { - expect.assertions(2) const api = useApi() await api @@ -1268,7 +1264,6 @@ describe("/admin/discounts", () => { }) it("fails to create a discount if the regions contains an invalid regionId ", async () => { - expect.assertions(2) const api = useApi() const err = await api.post( @@ -1293,7 +1288,6 @@ describe("/admin/discounts", () => { }) it("fails to create a discount if the regions contains only invalid regionIds ", async () => { - expect.assertions(2) const api = useApi() const err = await api.post( @@ -1318,7 +1312,6 @@ describe("/admin/discounts", () => { }) it("fails to create a discount if regions are not present ", async () => { - expect.assertions(2) const api = useApi() const err = await api.post( diff --git a/packages/medusa/src/helpers/test-request.js b/packages/medusa/src/helpers/test-request.js index c9951f80ad..cb0ee38003 100644 --- a/packages/medusa/src/helpers/test-request.js +++ b/packages/medusa/src/helpers/test-request.js @@ -11,7 +11,6 @@ import { moduleHelper } from "../loaders/module" import passportLoader from "../loaders/passport" import servicesLoader from "../loaders/services" import strategiesLoader from "../loaders/strategies" -import { clone } from "lodash" const adminSessionOpts = { cookieName: "session", @@ -88,7 +87,7 @@ export async function request(method, url, opts = {}) { ) headers.Cookie = headers.Cookie || "" if (opts.adminSession) { - const adminSession = clone(opts.adminSession) + const adminSession = { ...opts.adminSession } if (adminSession.jwt) { adminSession.jwt = jwt.sign( diff --git a/packages/medusa/src/services/__tests__/discount.js b/packages/medusa/src/services/__tests__/discount.js index ce78505e6e..48ec11131d 100644 --- a/packages/medusa/src/services/__tests__/discount.js +++ b/packages/medusa/src/services/__tests__/discount.js @@ -54,21 +54,18 @@ describe("DiscountService", () => { }) it("fails to create a discount without regions", async () => { - expect.assertions(3) - try { - await discountService.create({ - code: "test", - rule: { - type: "fixed", - allocation: "total", - value: 20, - }, - }) - } catch (err) { - expect(err.type).toEqual("invalid_data") - expect(err.message).toEqual("Discount must have atleast 1 region") - expect(discountRepository.create).toHaveBeenCalledTimes(0) - } + const err = await discountService.create({ + code: "test", + rule: { + type: "fixed", + allocation: "total", + value: 20, + }, + }).catch(e => e) + + expect(err.type).toEqual("invalid_data") + expect(err.message).toEqual("Discount must have atleast 1 region") + expect(discountRepository.create).toHaveBeenCalledTimes(0) }) it("successfully creates discount", async () => { diff --git a/packages/medusa/src/services/discount.ts b/packages/medusa/src/services/discount.ts index e37bbb3a50..f609d24940 100644 --- a/packages/medusa/src/services/discount.ts +++ b/packages/medusa/src/services/discount.ts @@ -212,7 +212,7 @@ class DiscountService extends TransactionBaseService { )) as Region[] } - if (isEmpty(discount.regions)) { + if (!discount.regions?.length) { throw new MedusaError( MedusaError.Types.INVALID_DATA, "Discount must have atleast 1 region"