Fix testing for changes to Order/Cart interfaces

Author: mvantellingen

src/commercetools/testing/carts.py

@@ -63,12 +63,14 @@ def _create_line_item_from_draft(
                     fraction_digits=2,
                 ),
             ),
+            taxed_price_portions=[],
+            per_method_tax_rate=[],
             total_price=models.CentPrecisionMoney(
                 currency_code=draft.currency,
                 cent_amount=price * (line_item_draft.quantity or 0),
                 fraction_digits=2,
             ),
-            quantity=line_item_draft.quantity,
+            quantity=line_item_draft.quantity or 1,
             discounted_price_per_quantity=[],
             state=[],
             price_mode=models.LineItemPriceMode.PLATFORM,
@@ -154,6 +156,8 @@ def _create_from_draft(
             custom_line_items=[],
             refused_gifts=[],
             shipping_address=draft.shipping_address,
+            shipping_mode=models.ShippingMode.SINGLE,
+            shipping=[],
             billing_address=draft.billing_address,
             locale=draft.locale,
             origin=draft.origin or models.CartOrigin.CUSTOMER,

src/commercetools/testing/orders.py

@@ -83,6 +83,8 @@ def _create_from_cart_draft(self, draft: models.OrderFromCartDraft, id: str):
             refused_gifts=[],
             order_number=draft.order_number,
             payment_state=draft.payment_state,
+            shipping_mode=models.ShippingMode.SINGLE,
+            shipping=[],
             order_state=OrderState.OPEN,
             origin=CartOrigin.CUSTOMER,
         )
@@ -113,6 +115,8 @@ def _create_from_import_draft(self, draft: models.OrderImportDraft, id: str):
             payment_state=draft.payment_state,
             order_state=OrderState.OPEN,
             origin=CartOrigin.CUSTOMER,
+            shipping_mode=models.ShippingMode.SINGLE,
+            shipping=[],
             custom=create_from_draft(draft.custom),
         )
         return order
@@ -170,6 +174,8 @@ def _create_line_item_from_draft(self, draft: models.LineItemImportDraft):
             state=[],
             discounted_price_per_quantity=[],
             tax_rate=draft.tax_rate,
+            taxed_price_portions=[],
+            per_method_tax_rate=[],
             taxed_price=taxed_price,
             custom=create_from_draft(draft.custom),
             shipping_details=create_from_draft(draft.shipping_details),
@@ -221,6 +227,7 @@ def _create_custom_line_item_from_draft(self, draft: models.CustomLineItemDraft)
             tax_category=draft.tax_category,
             tax_rate=create_from_draft(draft.external_tax_rate),
             taxed_price=taxed_price,
+            price_mode=models.ProductPriceModeEnum.EMBEDDED,
             custom=create_from_draft(draft.custom),
             shipping_details=create_from_draft(draft.shipping_details),
         )

tests/platform/test_expand.py

@@ -25,7 +25,7 @@ def test_unknown_expand_terms(ct_platform_client: PlatformClient):
             expand=["nonExisting"],
         )
     )
-
+    assert order is not None
     assert order.id
 
 
@@ -40,6 +40,7 @@ def test_optional_expanded_terms(ct_platform_client: PlatformClient, commercetoo
         .get(expand=["discountCodes[*].discountCode"])
     )
 
+    assert expanded_order is not None
     assert expanded_order.id
     assert expanded_order.discount_codes is None
 
@@ -57,7 +58,10 @@ def test_unknown_reference_expand_terms(
         .get(expand=["shippingInfo.shippingMethod"])
     )
 
+    assert expanded_order is not None
     assert expanded_order.id
+    assert expanded_order.shipping_info is not None
+    assert expanded_order.shipping_info.shipping_method is not None
     assert expanded_order.shipping_info.shipping_method.obj is None
 
 
@@ -90,6 +94,10 @@ def test_multiple_expand(old_client, commercetools_api):
     )
 
     order = get_test_order()
+    assert order.shipping_info is not None
+    assert order.shipping_info.shipping_method is not None
+    assert order.payment_info is not None
+
     order.shipping_info.shipping_method.id = shipping_method.id
     order.payment_info.payments[0].id = payment.id
     commercetools_api.orders.add_existing(order)

tests/platform/test_service_order.py

@@ -229,6 +229,8 @@ def get_test_order():
                     country="GB",
                     id="7JkeuGwo",
                 ),
+                taxed_price_portions=[],
+                per_method_tax_rate=[],
                 state=[
                     models.ItemState(
                         quantity=1,
@@ -269,6 +271,8 @@ def get_test_order():
                 }
             ),
         ),
+        shipping=[],
+        shipping_mode=models.ShippingMode.SINGLE,
         shipping_address=models.Address(
             first_name="David",
             last_name="Weterings",