From fa0e2d5fd5f1d2635b80b887cd33b6cd8d50ddb9 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Fri, 10 Sep 2021 12:46:35 +0530 Subject: [PATCH] test: basic tests for controllers/queries (#27422) (cherry picked from commit 62fc5442801e09dfa8e93b7855a0de3e487ba458) # Conflicts: # erpnext/controllers/queries.py # erpnext/controllers/tests/test_queries.py --- erpnext/controllers/queries.py | 5 +++++ erpnext/controllers/tests/test_queries.py | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py index e39ef9d8e40..0642d02daa1 100644 --- a/erpnext/controllers/queries.py +++ b/erpnext/controllers/queries.py @@ -337,9 +337,14 @@ def bom(doctype, txt, searchfield, start, page_len, filters): @frappe.whitelist() @frappe.validate_and_sanitize_search_inputs def get_project_name(doctype, txt, searchfield, start, page_len, filters): +<<<<<<< HEAD doctype = "Project" cond = "" if filters and filters.get("customer"): +======= + cond = '' + if filters and filters.get('customer'): +>>>>>>> 62fc544280 (test: basic tests for controllers/queries (#27422)) cond = """(`tabProject`.customer = %s or ifnull(`tabProject`.customer,"")="") and""" % ( frappe.db.escape(filters.get("customer")) diff --git a/erpnext/controllers/tests/test_queries.py b/erpnext/controllers/tests/test_queries.py index 60d1733021c..187e1979c58 100644 --- a/erpnext/controllers/tests/test_queries.py +++ b/erpnext/controllers/tests/test_queries.py @@ -1,8 +1,11 @@ import unittest from functools import partial +<<<<<<< HEAD import frappe +======= +>>>>>>> 62fc544280 (test: basic tests for controllers/queries (#27422)) from erpnext.controllers import queries @@ -56,12 +59,15 @@ class TestQueries(unittest.TestCase): bundled_stock_items = query(txt="_test product bundle item 5", filters={"is_stock_item": 1}) self.assertEqual(len(bundled_stock_items), 0) +<<<<<<< HEAD # empty customer/supplier should be stripped of instead of failure query(txt="", filters={"customer": None}) query(txt="", filters={"customer": ""}) query(txt="", filters={"supplier": None}) query(txt="", filters={"supplier": ""}) +======= +>>>>>>> 62fc544280 (test: basic tests for controllers/queries (#27422)) def test_bom_qury(self): query = add_default_params(queries.bom, "BOM") @@ -93,6 +99,9 @@ class TestQueries(unittest.TestCase): wh = query(filters=[["Bin", "item_code", "=", "_Test Item"]]) self.assertGreaterEqual(len(wh), 1) +<<<<<<< HEAD def test_default_uoms(self): self.assertGreaterEqual(frappe.db.count("UOM", {"enabled": 1}), 10) +======= +>>>>>>> 62fc544280 (test: basic tests for controllers/queries (#27422))