chore(integration-tests): Fixed merge conflict

2022-08-25 16:04:49 +02:00
parent 9ea5cb1ce6 384c8efb8b
commit f7a63f1782
212 changed files with 6791 additions and 3775 deletions
@@ -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,
+        }),
+      ])
+    )
  })
 })