refactor(tests): frappe.db.delete > frappe.db.sql
Use frappe.db.delete wherever possible. Get rid of all the frappe.db.sql ;) This commit focuses on the tests written under the doctype specific tests
This commit is contained in:
parent
c00a5003f4
commit
ebc220db39
17 changed files with 46 additions and 46 deletions
|
|
@ -76,7 +76,7 @@ class TestAutoAssign(unittest.TestCase):
|
|||
# clear 5 assignments for first user
|
||||
# can't do a limit in "delete" since postgres does not support it
|
||||
for d in frappe.get_all('ToDo', dict(reference_type = 'Note', owner = 'test@example.com'), limit=5):
|
||||
frappe.db.sql("delete from tabToDo where name = %s", d.name)
|
||||
frappe.db.delete("ToDo", {"name": d.name})
|
||||
|
||||
# add 5 more assignments
|
||||
for i in range(5):
|
||||
|
|
@ -177,7 +177,7 @@ class TestAutoAssign(unittest.TestCase):
|
|||
), 'owner'), 'test@example.com')
|
||||
|
||||
def check_assignment_rule_scheduling(self):
|
||||
frappe.db.sql("DELETE FROM `tabAssignment Rule`")
|
||||
frappe.db.delete("Assignment Rule")
|
||||
|
||||
days_1 = [dict(day = 'Sunday'), dict(day = 'Monday'), dict(day = 'Tuesday')]
|
||||
|
||||
|
|
@ -204,7 +204,7 @@ class TestAutoAssign(unittest.TestCase):
|
|||
), 'owner'), ['test3@example.com'])
|
||||
|
||||
def test_assignment_rule_condition(self):
|
||||
frappe.db.sql("DELETE FROM `tabAssignment Rule`")
|
||||
frappe.db.delete("Assignment Rule")
|
||||
|
||||
# Add expiry_date custom field
|
||||
from frappe.custom.doctype.custom_field.custom_field import create_custom_field
|
||||
|
|
@ -253,7 +253,7 @@ class TestAutoAssign(unittest.TestCase):
|
|||
assignment_rule.delete()
|
||||
|
||||
def clear_assignments():
|
||||
frappe.db.sql("delete from tabToDo where reference_type = 'Note'")
|
||||
frappe.db.delete("ToDo", {"reference_type": "Note"})
|
||||
|
||||
def get_assignment_rule(days, assign=None):
|
||||
frappe.delete_doc_if_exists('Assignment Rule', 'For Note 1')
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import unittest
|
|||
|
||||
class TestMilestoneTracker(unittest.TestCase):
|
||||
def test_milestone(self):
|
||||
frappe.db.sql('delete from `tabMilestone Tracker`')
|
||||
frappe.db.delete("Milestone Tracker")
|
||||
|
||||
frappe.cache().delete_key('milestone_tracker_map')
|
||||
|
||||
|
|
@ -44,5 +44,5 @@ class TestMilestoneTracker(unittest.TestCase):
|
|||
self.assertEqual(milestones[0].value, 'Closed')
|
||||
|
||||
# cleanup
|
||||
frappe.db.sql('delete from tabMilestone')
|
||||
frappe.db.delete("Milestone")
|
||||
milestone_tracker.delete()
|
||||
|
|
@ -30,7 +30,7 @@ class TestComment(unittest.TestCase):
|
|||
from frappe.website.doctype.blog_post.test_blog_post import make_test_blog
|
||||
test_blog = make_test_blog()
|
||||
|
||||
frappe.db.sql("delete from `tabComment` where reference_doctype = 'Blog Post'")
|
||||
frappe.db.delete("Comment", {"reference_doctype": "Blog Post"})
|
||||
|
||||
from frappe.templates.includes.comments.comments import add_comment
|
||||
add_comment('Good comment with 10 chars', 'test@test.com', 'Good Tester',
|
||||
|
|
@ -41,7 +41,7 @@ class TestComment(unittest.TestCase):
|
|||
reference_name = test_blog.name
|
||||
))[0].published, 1)
|
||||
|
||||
frappe.db.sql("delete from `tabComment` where reference_doctype = 'Blog Post'")
|
||||
frappe.db.delete("Comment", {"reference_doctype": "Blog Post"})
|
||||
|
||||
add_comment('pleez vizits my site http://mysite.com', 'test@test.com', 'bad commentor',
|
||||
'Blog Post', test_blog.name, test_blog.route)
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ class TestFeedback(unittest.TestCase):
|
|||
from frappe.website.doctype.blog_post.test_blog_post import make_test_blog
|
||||
test_blog = make_test_blog()
|
||||
|
||||
frappe.db.sql("delete from `tabFeedback` where reference_doctype = 'Blog Post'")
|
||||
frappe.db.delete("Feedback", {"reference_doctype": "Blog Post"})
|
||||
|
||||
from frappe.templates.includes.feedback.feedback import add_feedback, update_feedback
|
||||
feedback = add_feedback('Blog Post', test_blog.name, 5, 'New feedback')
|
||||
|
|
@ -22,6 +22,6 @@ class TestFeedback(unittest.TestCase):
|
|||
self.assertEqual(updated_feedback.feedback, 'Updated feedback')
|
||||
self.assertEqual(updated_feedback.rating, 6)
|
||||
|
||||
frappe.db.sql("delete from `tabFeedback` where reference_doctype = 'Blog Post'")
|
||||
frappe.db.delete("Feedback", {"reference_doctype": "Blog Post"})
|
||||
|
||||
test_blog.delete()
|
||||
|
|
@ -8,7 +8,7 @@ from frappe import _
|
|||
|
||||
class TestTranslation(unittest.TestCase):
|
||||
def setUp(self):
|
||||
frappe.db.sql('delete from tabTranslation')
|
||||
frappe.db.delete("Translation")
|
||||
|
||||
def tearDown(self):
|
||||
frappe.local.lang = 'en'
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ class TestUser(unittest.TestCase):
|
|||
def test_delete(self):
|
||||
frappe.get_doc("User", "test@example.com").add_roles("_Test Role 2")
|
||||
self.assertRaises(frappe.LinkExistsError, delete_doc, "Role", "_Test Role 2")
|
||||
frappe.db.sql("""delete from `tabHas Role` where role='_Test Role 2'""")
|
||||
frappe.db.delete("Has Role", {"role": "_Test Role 2"})
|
||||
delete_doc("Role","_Test Role 2")
|
||||
|
||||
if frappe.db.exists("User", "_test@example.com"):
|
||||
|
|
@ -294,5 +294,5 @@ class TestUser(unittest.TestCase):
|
|||
# self.assertIsNone(frappe.db.get("User", {"email": email}))
|
||||
|
||||
def delete_contact(user):
|
||||
frappe.db.sql("DELETE FROM `tabContact` WHERE `email_id`= %s", user)
|
||||
frappe.db.sql("DELETE FROM `tabContact Email` WHERE `email_id`= %s", user)
|
||||
frappe.db.delete("Contact", {"email_id": user})
|
||||
frappe.db.delete("Contact Email", {"email_id": user})
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ test_records = frappe.get_test_records('Event')
|
|||
|
||||
class TestEvent(unittest.TestCase):
|
||||
def setUp(self):
|
||||
frappe.db.sql('delete from tabEvent')
|
||||
frappe.db.delete("Event")
|
||||
make_test_objects('Event', reset=True)
|
||||
|
||||
self.test_records = frappe.get_test_records('Event')
|
||||
|
|
|
|||
|
|
@ -8,9 +8,9 @@ test_records = frappe.get_test_records('Note')
|
|||
|
||||
class TestNote(unittest.TestCase):
|
||||
def insert_note(self):
|
||||
frappe.db.sql('delete from tabVersion')
|
||||
frappe.db.sql('delete from tabNote')
|
||||
frappe.db.sql('delete from `tabNote Seen By`')
|
||||
frappe.db.delete("Version")
|
||||
frappe.db.delete("Note")
|
||||
frappe.db.delete("Note Seen By")
|
||||
|
||||
return frappe.get_doc(dict(doctype='Note', title='test note',
|
||||
content='test note content')).insert()
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ from frappe.desk.doctype.tag.tag import add_tag
|
|||
|
||||
class TestTag(unittest.TestCase):
|
||||
def setUp(self) -> None:
|
||||
frappe.db.sql("DELETE from `tabTag`")
|
||||
frappe.db.delete("Tag")
|
||||
frappe.db.sql("UPDATE `tabDocType` set _user_tags=''")
|
||||
|
||||
def test_tag_count_query(self):
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ class TestToDo(unittest.TestCase):
|
|||
todo = frappe.get_doc(dict(doctype='ToDo', description='test todo',
|
||||
assigned_by='Administrator')).insert()
|
||||
|
||||
frappe.db.sql('delete from `tabDeleted Document`')
|
||||
frappe.db.delete("Deleted Document")
|
||||
todo.delete()
|
||||
|
||||
deleted = frappe.get_doc('Deleted Document', dict(deleted_doctype=todo.doctype, deleted_name=todo.name))
|
||||
|
|
@ -27,7 +27,7 @@ class TestToDo(unittest.TestCase):
|
|||
frappe.db.get_value('User', todo.assigned_by, 'full_name'))
|
||||
|
||||
def test_fetch_setup(self):
|
||||
frappe.db.sql('delete from tabToDo')
|
||||
frappe.db.delete("ToDo")
|
||||
|
||||
todo_meta = frappe.get_doc('DocType', 'ToDo')
|
||||
todo_meta.get('fields', dict(fieldname='assigned_by_full_name'))[0].fetch_from = ''
|
||||
|
|
@ -105,7 +105,7 @@ class TestToDo(unittest.TestCase):
|
|||
frappe.db.rollback()
|
||||
|
||||
def test_fetch_if_empty(self):
|
||||
frappe.db.sql('delete from tabToDo')
|
||||
frappe.db.delete("ToDo")
|
||||
|
||||
# Allow user changes
|
||||
todo_meta = frappe.get_doc('DocType', 'ToDo')
|
||||
|
|
|
|||
|
|
@ -34,8 +34,8 @@ class TestEmailAccount(unittest.TestCase):
|
|||
def setUp(self):
|
||||
frappe.flags.mute_emails = False
|
||||
frappe.flags.sent_mail = None
|
||||
frappe.db.sql('delete from `tabEmail Queue`')
|
||||
frappe.db.sql('delete from `tabUnhandled Email`')
|
||||
frappe.db.delete("Email Queue")
|
||||
frappe.db.delete("Unhandled Email")
|
||||
|
||||
def get_test_mail(self, fname):
|
||||
with open(os.path.join(os.path.dirname(__file__), "test_mails", fname), "r") as f:
|
||||
|
|
@ -60,7 +60,7 @@ class TestEmailAccount(unittest.TestCase):
|
|||
comm = frappe.get_doc("Communication", {"sender": "test_sender@example.com"})
|
||||
comm.db_set("creation", datetime.now() - timedelta(seconds = 30 * 60))
|
||||
|
||||
frappe.db.sql("DELETE FROM `tabEmail Queue`")
|
||||
frappe.db.delete("Email Queue")
|
||||
notify_unreplied()
|
||||
self.assertTrue(frappe.db.get_value("Email Queue", {"reference_doctype": comm.reference_doctype,
|
||||
"reference_name": comm.reference_name, "status":"Not Sent"}))
|
||||
|
|
@ -183,7 +183,7 @@ class TestEmailAccount(unittest.TestCase):
|
|||
|
||||
def test_threading_by_message_id(self):
|
||||
cleanup()
|
||||
frappe.db.sql("""delete from `tabEmail Queue`""")
|
||||
frappe.db.delete("Email Queue")
|
||||
|
||||
# reference document for testing
|
||||
event = frappe.get_doc(dict(doctype='Event', subject='test-message')).insert()
|
||||
|
|
@ -242,8 +242,8 @@ class TestInboundMail(unittest.TestCase):
|
|||
|
||||
def setUp(self):
|
||||
cleanup()
|
||||
frappe.db.sql('delete from `tabEmail Queue`')
|
||||
frappe.db.sql('delete from `tabToDo`')
|
||||
frappe.db.delete("Email Queue")
|
||||
frappe.db.delete("ToDo")
|
||||
|
||||
def get_test_mail(self, fname):
|
||||
with open(os.path.join(os.path.dirname(__file__), "test_mails", fname), "r") as f:
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ test_dependencies = ["User", "Notification"]
|
|||
|
||||
class TestNotification(unittest.TestCase):
|
||||
def setUp(self):
|
||||
frappe.db.sql("""delete from `tabEmail Queue`""")
|
||||
frappe.db.delete("Email Queue")
|
||||
frappe.set_user("test@example.com")
|
||||
|
||||
if not frappe.db.exists('Notification', {'name': 'ToDo Status Update'}, 'name'):
|
||||
|
|
@ -50,7 +50,7 @@ class TestNotification(unittest.TestCase):
|
|||
|
||||
self.assertTrue(frappe.db.get_value("Email Queue", {"reference_doctype": "Communication",
|
||||
"reference_name": communication.name, "status":"Not Sent"}))
|
||||
frappe.db.sql("""delete from `tabEmail Queue`""")
|
||||
frappe.db.delete("Email Queue")
|
||||
|
||||
communication.reload()
|
||||
communication.content = "test 2"
|
||||
|
|
@ -189,9 +189,9 @@ class TestNotification(unittest.TestCase):
|
|||
|
||||
def test_cc_jinja(self):
|
||||
|
||||
frappe.db.sql("""delete from `tabUser` where email='test_jinja@example.com'""")
|
||||
frappe.db.sql("""delete from `tabEmail Queue`""")
|
||||
frappe.db.sql("""delete from `tabEmail Queue Recipient`""")
|
||||
frappe.db.delete("User", {"email": "test_jinja@example.com"})
|
||||
frappe.db.delete("Email Queue")
|
||||
frappe.db.delete("Email Queue Recipient")
|
||||
|
||||
test_user = frappe.new_doc("User")
|
||||
test_user.name = 'test_jinja'
|
||||
|
|
@ -205,9 +205,9 @@ class TestNotification(unittest.TestCase):
|
|||
|
||||
self.assertTrue(frappe.db.get_value("Email Queue Recipient", {"recipient": "test_jinja@example.com"}))
|
||||
|
||||
frappe.db.sql("""delete from `tabUser` where email='test_jinja@example.com'""")
|
||||
frappe.db.sql("""delete from `tabEmail Queue`""")
|
||||
frappe.db.sql("""delete from `tabEmail Queue Recipient`""")
|
||||
frappe.db.delete("User", {"email": "test_jinja@example.com"})
|
||||
frappe.db.delete("Email Queue")
|
||||
frappe.db.delete("Email Queue Recipient")
|
||||
|
||||
def test_notification_to_assignee(self):
|
||||
todo = frappe.new_doc('ToDo')
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@ class TestWebhook(unittest.TestCase):
|
|||
@classmethod
|
||||
def setUpClass(cls):
|
||||
# delete any existing webhooks
|
||||
frappe.db.sql("DELETE FROM tabWebhook")
|
||||
frappe.db.delete("Webhook")
|
||||
# Delete existing logs if any
|
||||
frappe.db.sql("DELETE FROM `tabWebhook Request Log`")
|
||||
frappe.db.delete("Webhook Request Log")
|
||||
# create test webhooks
|
||||
cls.create_sample_webhooks()
|
||||
|
||||
|
|
@ -46,7 +46,7 @@ class TestWebhook(unittest.TestCase):
|
|||
@classmethod
|
||||
def tearDownClass(cls):
|
||||
# delete any existing webhooks
|
||||
frappe.db.sql("DELETE FROM tabWebhook")
|
||||
frappe.db.delete("Webhook")
|
||||
|
||||
def setUp(self):
|
||||
# retrieve or create a User webhook for `after_insert`
|
||||
|
|
@ -168,7 +168,7 @@ class TestWebhook(unittest.TestCase):
|
|||
def test_webhook_req_log_creation(self):
|
||||
if not frappe.db.get_value('User', 'user2@integration.webhooks.test.com'):
|
||||
user = frappe.get_doc({
|
||||
'doctype': 'User',
|
||||
'doctype': 'User',
|
||||
'email': 'user2@integration.webhooks.test.com',
|
||||
'first_name': 'user2'
|
||||
}).insert()
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@ class TestEnergyPointLog(unittest.TestCase):
|
|||
|
||||
def tearDown(self):
|
||||
frappe.set_user('Administrator')
|
||||
frappe.db.sql('DELETE FROM `tabEnergy Point Log`')
|
||||
frappe.db.sql('DELETE FROM `tabEnergy Point Rule`')
|
||||
frappe.db.delete("Energy Point Log")
|
||||
frappe.db.delete("Energy Point Rule")
|
||||
frappe.cache().delete_value('energy_point_rule_map')
|
||||
|
||||
def test_user_energy_point(self):
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ class TestRequestPersonalData(unittest.TestCase):
|
|||
create_user_if_not_exists(email='test_privacy@example.com')
|
||||
|
||||
def tearDown(self):
|
||||
frappe.db.sql("""DELETE FROM `tabPersonal Data Download Request`""")
|
||||
frappe.db.delete("Personal Data Download Request")
|
||||
|
||||
def test_user_data_creation(self):
|
||||
user_data = json.loads(get_user_data('test_privacy@example.com'))
|
||||
|
|
@ -45,7 +45,7 @@ class TestRequestPersonalData(unittest.TestCase):
|
|||
limit=1)
|
||||
self.assertTrue("Subject: Download Your Data" in email_queue[0].message)
|
||||
|
||||
frappe.db.sql("delete from `tabEmail Queue`")
|
||||
frappe.db.delete("Email Queue")
|
||||
|
||||
def create_user_if_not_exists(email, first_name = None):
|
||||
frappe.delete_doc_if_exists("User", email)
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ test_records = frappe.get_test_records('Web Page')
|
|||
|
||||
class TestWebPage(unittest.TestCase):
|
||||
def setUp(self):
|
||||
frappe.db.sql("delete from `tabWeb Page`")
|
||||
frappe.db.delete("Web Page")
|
||||
for t in test_records:
|
||||
frappe.get_doc(t).insert()
|
||||
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ class TestWorkflow(unittest.TestCase):
|
|||
self.assertListEqual(actions, ['Review'])
|
||||
|
||||
def test_if_workflow_actions_were_processed(self):
|
||||
frappe.db.sql('delete from `tabWorkflow Action`')
|
||||
frappe.db.delete("Workflow Action")
|
||||
user = frappe.get_doc('User', 'test2@example.com')
|
||||
user.add_roles('Test Approver', 'System Manager')
|
||||
frappe.set_user('test2@example.com')
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue