From bb60a59b96ba028b38ac95c54e8990e4fddc9d77 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 19 Oct 2017 12:14:37 +0530 Subject: [PATCH] Fixed asset test cases due to tax rule (#11247) * Fixed asset testcases due to tax rule * Delete tax rule record after running test cases * Fixed test cases * Fixed test cases * Fixed subscription tests due to tax rule --- erpnext/accounts/doctype/asset/test_asset.py | 1 + erpnext/accounts/doctype/subscription/test_subscription.py | 2 +- erpnext/accounts/doctype/tax_rule/test_tax_rule.py | 5 ++++- .../shopping_cart_settings/test_shopping_cart_settings.py | 1 + erpnext/stock/doctype/item/test_item.py | 3 ++- 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/doctype/asset/test_asset.py b/erpnext/accounts/doctype/asset/test_asset.py index 21596f1132..831373a9c9 100644 --- a/erpnext/accounts/doctype/asset/test_asset.py +++ b/erpnext/accounts/doctype/asset/test_asset.py @@ -13,6 +13,7 @@ class TestAsset(unittest.TestCase): def setUp(self): set_depreciation_settings_in_company() create_asset() + frappe.db.sql("delete from `tabTax Rule`") def test_purchase_asset(self): asset = frappe.get_doc("Asset", "Macbook Pro 1") diff --git a/erpnext/accounts/doctype/subscription/test_subscription.py b/erpnext/accounts/doctype/subscription/test_subscription.py index b74163c92e..4ccf483c1a 100644 --- a/erpnext/accounts/doctype/subscription/test_subscription.py +++ b/erpnext/accounts/doctype/subscription/test_subscription.py @@ -30,7 +30,7 @@ class TestSubscription(unittest.TestCase): new_quotation = frappe.get_doc('Quotation', new_quotation) - for fieldname in ['customer', 'company', 'order_type', 'total', 'grand_total']: + for fieldname in ['customer', 'company', 'order_type', 'total', 'net_total']: self.assertEquals(quotation.get(fieldname), new_quotation.get(fieldname)) for fieldname in ['item_code', 'qty', 'rate', 'amount']: diff --git a/erpnext/accounts/doctype/tax_rule/test_tax_rule.py b/erpnext/accounts/doctype/tax_rule/test_tax_rule.py index 5ad7970a6e..ee5b3c9d6a 100644 --- a/erpnext/accounts/doctype/tax_rule/test_tax_rule.py +++ b/erpnext/accounts/doctype/tax_rule/test_tax_rule.py @@ -11,7 +11,10 @@ test_records = frappe.get_test_records('Tax Rule') class TestTaxRule(unittest.TestCase): def setUp(self): - frappe.db.sql("delete from `tabTax Rule` where use_for_shopping_cart <> 1") + frappe.db.sql("delete from `tabTax Rule`") + + def tearDown(self): + frappe.db.sql("delete from `tabTax Rule`") def test_conflict(self): tax_rule1 = make_tax_rule(customer= "_Test Customer", diff --git a/erpnext/shopping_cart/doctype/shopping_cart_settings/test_shopping_cart_settings.py b/erpnext/shopping_cart/doctype/shopping_cart_settings/test_shopping_cart_settings.py index 390bc27568..75899e121a 100644 --- a/erpnext/shopping_cart/doctype/shopping_cart_settings/test_shopping_cart_settings.py +++ b/erpnext/shopping_cart/doctype/shopping_cart_settings/test_shopping_cart_settings.py @@ -39,3 +39,4 @@ class TestShoppingCartSettings(unittest.TestCase): frappe.db.sql("update `tabTax Rule` set use_for_shopping_cart = 1") +test_dependencies = ["Tax Rule"] \ No newline at end of file diff --git a/erpnext/stock/doctype/item/test_item.py b/erpnext/stock/doctype/item/test_item.py index c3f399a536..5cf98a1a4d 100644 --- a/erpnext/stock/doctype/item/test_item.py +++ b/erpnext/stock/doctype/item/test_item.py @@ -190,7 +190,8 @@ class TestItem(unittest.TestCase): "increment": 0.5 } ], - "default_warehouse": "_Test Warehouse - _TC" + "default_warehouse": "_Test Warehouse - _TC", + "has_variants": 1 }) variant = create_variant("_Test Numeric Template Item",