fix: Merge conflicts, Linter and Server Test
- Resolve inconsistency due to conflict with https://github.com/frappe/erpnext/pull/27050 - Resolve Linter issues (imports and spaces) - Include customer_reviews.js in bundle, move it to /public/js
This commit is contained in:
parent
19e5dfbb7c
commit
7bc087ed44
@ -18,18 +18,26 @@ class TestECommerceSettings(unittest.TestCase):
|
|||||||
return frappe.get_doc({"doctype": "E Commerce Settings",
|
return frappe.get_doc({"doctype": "E Commerce Settings",
|
||||||
"company": "_Test Company"})
|
"company": "_Test Company"})
|
||||||
|
|
||||||
def test_exchange_rate_exists(self):
|
# NOTE: Exchangrate API has all enabled currencies that ERPNext supports.
|
||||||
frappe.db.sql("""delete from `tabCurrency Exchange`""")
|
# We aren't checking just currency exchange record anymore
|
||||||
|
# while validating price list currency exchange rate to that of company.
|
||||||
|
# The API is being used to fetch the rate which again almost always
|
||||||
|
# gives back a valid value (for valid currencies).
|
||||||
|
# This makes the test obsolete.
|
||||||
|
# Commenting because im not sure if there's a better test we can write
|
||||||
|
|
||||||
cart_settings = self.get_cart_settings()
|
# def test_exchange_rate_exists(self):
|
||||||
cart_settings.price_list = "_Test Price List Rest of the World"
|
# frappe.db.sql("""delete from `tabCurrency Exchange`""")
|
||||||
self.assertRaises(ShoppingCartSetupError, cart_settings.validate_exchange_rates_exist)
|
|
||||||
|
|
||||||
from erpnext.setup.doctype.currency_exchange.test_currency_exchange import (
|
# cart_settings = self.get_cart_settings()
|
||||||
test_records as currency_exchange_records,
|
# cart_settings.price_list = "_Test Price List Rest of the World"
|
||||||
)
|
# self.assertRaises(ShoppingCartSetupError, cart_settings.validate_exchange_rates_exist)
|
||||||
frappe.get_doc(currency_exchange_records[0]).insert()
|
|
||||||
cart_settings.validate_exchange_rates_exist()
|
# from erpnext.setup.doctype.currency_exchange.test_currency_exchange import (
|
||||||
|
# test_records as currency_exchange_records,
|
||||||
|
# )
|
||||||
|
# frappe.get_doc(currency_exchange_records[0]).insert()
|
||||||
|
# cart_settings.validate_exchange_rates_exist()
|
||||||
|
|
||||||
def test_tax_rule_validation(self):
|
def test_tax_rule_validation(self):
|
||||||
frappe.db.sql("update `tabTax Rule` set use_for_shopping_cart = 0")
|
frappe.db.sql("update `tabTax Rule` set use_for_shopping_cart = 0")
|
||||||
|
|||||||
@ -18,6 +18,7 @@ from erpnext.e_commerce.doctype.website_item.website_item import make_website_it
|
|||||||
from erpnext.e_commerce.shopping_cart.cart import get_party
|
from erpnext.e_commerce.shopping_cart.cart import get_party
|
||||||
from erpnext.stock.doctype.item.test_item import make_item
|
from erpnext.stock.doctype.item.test_item import make_item
|
||||||
|
|
||||||
|
|
||||||
class TestItemReview(unittest.TestCase):
|
class TestItemReview(unittest.TestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
item = make_item("Test Mobile Phone")
|
item = make_item("Test Mobile Phone")
|
||||||
|
|||||||
@ -236,7 +236,7 @@ doc_events = {
|
|||||||
"erpnext.support.doctype.issue.issue.set_first_response_time"
|
"erpnext.support.doctype.issue.issue.set_first_response_time"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
("Sales Taxes and Charges Template", "Price List"): {
|
"Sales Taxes and Charges Template": {
|
||||||
"on_update": "erpnext.e_commerce.doctype.e_commerce_settings.e_commerce_settings.validate_cart_settings"
|
"on_update": "erpnext.e_commerce.doctype.e_commerce_settings.e_commerce_settings.validate_cart_settings"
|
||||||
},
|
},
|
||||||
"Tax Category": {
|
"Tax Category": {
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
import "./website_utils";
|
import "./website_utils";
|
||||||
import "./shopping_cart";
|
import "./shopping_cart";
|
||||||
import "./wishlist";
|
import "./wishlist";
|
||||||
|
import "./customer_reviews";
|
||||||
import "../../e_commerce/product_ui/list";
|
import "../../e_commerce/product_ui/list";
|
||||||
import "../../e_commerce/product_ui/views";
|
import "../../e_commerce/product_ui/views";
|
||||||
import "../../e_commerce/product_ui/grid";
|
import "../../e_commerce/product_ui/grid";
|
||||||
|
|||||||
@ -536,7 +536,7 @@ class TestItem(ERPNextTestCase):
|
|||||||
"check if index is getting created in db"
|
"check if index is getting created in db"
|
||||||
|
|
||||||
indices = frappe.db.sql("show index from tabItem", as_dict=1)
|
indices = frappe.db.sql("show index from tabItem", as_dict=1)
|
||||||
expected_columns = {"item_code", "item_name", "item_group", "route"}
|
expected_columns = {"item_code", "item_name", "item_group"}
|
||||||
for index in indices:
|
for index in indices:
|
||||||
expected_columns.discard(index.get("Column_name"))
|
expected_columns.discard(index.get("Column_name"))
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user