asyavee/medusa-store
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: Remove region_id from countries on region deletes (#1330)

Browse Source 
* Remove region id from countries on delete

* Update snapshots
This commit is contained in:
Oliver Windall Juhl
2022-04-13 10:52:25 +02:00
committed by GitHub
parent 2a1b34c20f
commit edc6d9d29c
5 changed files with 222 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
integration-tests/api/__tests__/admin/__snapshots__/region.js.snap Normal file
View File

@@ -0,0 +1,49 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`/admin/regions Remove region from country on delete successfully creates a region with countries from a previously deleted region 1`] = `
Object {
"deleted": true,
"id": "test-region",
"object": "region",
}
`;
exports[`/admin/regions Remove region from country on delete successfully creates a region with countries from a previously deleted region 2`] = `
Object {
"automatic_taxes": true,
"countries": Array [
Object {
"display_name": "United States",
"id": 236,
"iso_2": "us",
"iso_3": "usa",
"name": "UNITED STATES",
"num_code": 840,
"region_id": Any<String>,
},
],
"created_at": Any<String>,
"currency_code": "usd",
"deleted_at": null,
"fulfillment_providers": Array [
Object {
"id": "test-ful",
"is_installed": true,
},
],
"gift_cards_taxable": true,
"id": Any<String>,
"metadata": null,
"name": "World",
"payment_providers": Array [
Object {
"id": "test-pay",
"is_installed": true,
},
],
"tax_code": null,
"tax_provider_id": null,
"tax_rate": 0,
"updated_at": Any<String>,
}
`;

146
integration-tests/api/__tests__/admin/region.js
View File

@@ -11,9 +11,9 @@ jest.setTimeout(30000)
describe("/admin/regions", () => {
let medusaProcess
let dbConnection
const cwd = path.resolve(path.join(__dirname, "..", ".."))
beforeAll(async () => {
const cwd = path.resolve(path.join(__dirname, "..", ".."))
dbConnection = await initDb({ cwd })
medusaProcess = await setupServer({ cwd })
})
@@ -21,11 +21,98 @@ describe("/admin/regions", () => {
afterAll(async () => {
const db = useDb()
await db.shutdown()
medusaProcess.kill()
})
describe("Remove region from country on delete", () => {
beforeEach(async () => {
try {
await adminSeeder(dbConnection)
const manager = dbConnection.manager
await manager.insert(Region, {
id: "test-region",
name: "Test Region",
currency_code: "usd",
tax_rate: 0,
})
await manager.query(
`UPDATE "country" SET region_id='test-region' WHERE iso_2 = 'us'`
)
} catch (err) {
console.log(err)
throw err
}
})
afterEach(async () => {
const db = useDb()
await db.teardown()
})
it("successfully creates a region with countries from a previously deleted region", async () => {
const api = useApi()
const response = await api
.delete(`/admin/regions/test-region`, {
headers: {
Authorization: "Bearer test_token",
},
})
.catch((err) => {
console.log(err)
})
expect(response.status).toEqual(200)
expect(response.data).toMatchSnapshot({
id: "test-region",
object: "region",
deleted: true,
})
const newReg = await api.post(
`/admin/regions`,
{
name: "World",
currency_code: "usd",
tax_rate: 0,
payment_providers: ["test-pay"],
fulfillment_providers: ["test-ful"],
countries: ["us"],
},
{
headers: {
Authorization: "Bearer test_token",
},
}
)
expect(newReg.status).toEqual(200)
expect(newReg.data.region).toMatchSnapshot({
id: expect.any(String),
name: "World",
currency_code: "usd",
countries: [
{
region_id: expect.any(String),
},
],
tax_rate: 0,
fulfillment_providers: [
{
id: "test-ful",
is_installed: true,
},
],
created_at: expect.any(String),
updated_at: expect.any(String),
})
})
})
describe("GET /admin/regions", () => {
beforeAll(async () => {
beforeEach(async () => {
const manager = dbConnection.manager
await adminSeeder(dbConnection)
await manager.insert(Region, {
@@ -57,7 +144,7 @@ describe("/admin/regions", () => {
})
})
afterAll(async () => {
afterEach(async () => {
const db = useDb()
await db.teardown()
})
@@ -116,14 +203,23 @@ describe("/admin/regions", () => {
describe("DELETE /admin/regions/:id", () => {
beforeEach(async () => {
const manager = dbConnection.manager
await adminSeeder(dbConnection)
await manager.insert(Region, {
id: "test-region",
name: "Test Region",
currency_code: "usd",
tax_rate: 0,
})
try {
await adminSeeder(dbConnection)
const manager = dbConnection.manager
await manager.insert(Region, {
id: "test-region",
name: "Test Region",
currency_code: "usd",
tax_rate: 0,
})
await manager.query(
`UPDATE "country" SET region_id='test-region' WHERE iso_2 = 'us'`
)
} catch (err) {
console.log(err)
throw err
}
})
afterEach(async () => {
@@ -164,5 +260,33 @@ describe("/admin/regions", () => {
})
expect(response.status).toEqual(200)
})
it("fails to create when countries exists in different region", async () => {
const api = useApi()
try {
await api.post(
`/admin/regions`,
{
name: "World",
currency_code: "usd",
tax_rate: 0,
payment_providers: ["test-pay"],
fulfillment_providers: ["test-ful"],
countries: ["us"],
},
{
headers: {
Authorization: "Bearer test_token",
},
}
)
} catch (error) {
expect(error.response.status).toEqual(422)
expect(error.response.data.message).toEqual(
"United States already exists in region test-region"
)
}
})
})
})