chore(integration-tests): Fixed merge conflict

integration-tests/api/__tests__/taxes/manual-taxes.js

@@ -6,8 +6,6 @@ const { initDb, useDb } = require("../../../helpers/use-db")
 
 const {
   simpleProductTaxRateFactory,
-  simpleShippingTaxRateFactory,
-  simpleShippingOptionFactory,
   simpleCartFactory,
   simpleRegionFactory,
   simpleProductFactory,

integration-tests/api/__tests__/taxes/orders.js

@@ -286,16 +286,22 @@ describe("Order Taxes", () => {
       response.data.data.items.flatMap((li) => li.tax_lines).length
     ).toEqual(2)
 
-    expect(response.data.data.items[0].tax_lines).toEqual([
-      expect.objectContaining({
-        rate: 25,
-      }),
-    ])
-    expect(response.data.data.items[1].tax_lines).toEqual([
-      expect.objectContaining({
-        rate: 20,
-      }),
-    ])
+    expect(response.data.data.items[0].tax_lines).toHaveLength(1)
+    expect(response.data.data.items[0].tax_lines).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          rate: 25,
+        }),
+      ])
+    )
+    expect(response.data.data.items[1].tax_lines).toHaveLength(1)
+    expect(response.data.data.items[1].tax_lines).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          rate: 20,
+        }),
+      ])
+    )
   })
 
   test("completing cart creates tax lines", async () => {
@@ -377,15 +383,21 @@ describe("Order Taxes", () => {
     expect(response.data.data.tax_total).toEqual(35)
     expect(response.data.data.total).toEqual(185)
 
-    expect(response.data.data.items[0].tax_lines).toEqual([
-      expect.objectContaining({
-        rate: 25,
-      }),
-    ])
-    expect(response.data.data.items[1].tax_lines).toEqual([
-      expect.objectContaining({
-        rate: 20,
-      }),
-    ])
+    expect(response.data.data.items[0].tax_lines).toHaveLength(1)
+    expect(response.data.data.items[0].tax_lines).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          rate: 25,
+        }),
+      ])
+    )
+    expect(response.data.data.items[1].tax_lines).toHaveLength(1)
+    expect(response.data.data.items[1].tax_lines).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          rate: 20,
+        }),
+      ])
+    )
   })
 })

integration-tests/api/__tests__/taxes/shipping-options.js

@@ -64,13 +64,16 @@ describe("Shipping Options Totals Calculations", () => {
       },
     })
 
-    expect(res.data.shipping_options).toEqual([
-      expect.objectContaining({
-        id: so.id,
-        amount: 100,
-        price_incl_tax: 110,
-      }),
-    ])
+    expect(res.data.shipping_options).toHaveLength(1)
+    expect(res.data.shipping_options).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          id: so.id,
+          amount: 100,
+          price_incl_tax: 110,
+        }),
+      ])
+    )
   })
 
   it("gets correct shipping prices", async () => {
@@ -93,12 +96,15 @@ describe("Shipping Options Totals Calculations", () => {
 
     const res = await api.get(`/store/shipping-options?region_id=${region.id}`)
 
-    expect(res.data.shipping_options).toEqual([
-      expect.objectContaining({
-        id: so.id,
-        amount: 100,
-        price_incl_tax: 110,
-      }),
-    ])
+    expect(res.data.shipping_options).toHaveLength(1)
+    expect(res.data.shipping_options).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          id: so.id,
+          amount: 100,
+          price_incl_tax: 110,
+        }),
+      ])
+    )
   })
 })