vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

refactor(tests): frappe.db.delete > frappe.db.sql

Browse source 
Use frappe.db.delete wherever possible. Get rid of all the frappe.db.sql
;)

This commit focuses on the frappe.tests module
This commit is contained in:
Gavin D'souza 2021-08-19 19:46:50 +05:30
parent 4cbf2c40e6
commit c00a5003f4
11 changed files with 41 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/tests/test_assign.py
View file

@ -22,7 +22,7 @@ class TestAssign(unittest.TestCase):
self.assertEqual(len(assignments), 0)
def test_assignment_count(self):
frappe.db.sql('delete from tabToDo')
frappe.db.delete("ToDo")
if not frappe.db.exists("User", "test_assign1@example.com"):
frappe.get_doc({"doctype":"User", "email":"test_assign1@example.com", "first_name":"Test", "roles": [{"role": "System Manager"}]}).insert()

2
frappe/tests/test_db_query.py
View file

@ -105,7 +105,7 @@ class TestReportview(unittest.TestCase):
def test_between_filters(self):
""" test case to check between filter for date fields """
frappe.db.sql("delete from tabEvent")
frappe.db.delete("Event")
# create events to test the between operator filter
todays_event = create_event()

6
frappe/tests/test_domainification.py
View file

@ -17,9 +17,9 @@ class TestDomainification(unittest.TestCase):
self.add_active_domain("_Test Domain 1")
def tearDown(self):
frappe.db.sql("delete from tabRole where name='_Test Role'")
frappe.db.sql("delete from `tabHas Role` where role='_Test Role'")
frappe.db.sql("delete from tabDomain where name in ('_Test Domain 1', '_Test Domain 2')")
frappe.db.delete("Role", {"name": "_Test Role"})
frappe.db.delete("Has Role", {"role": "_Test Role"})
frappe.db.delete("Domain", {"name": ("in", ("_Test Domain 1", "_Test Domain 2"))})
frappe.delete_doc('DocType', 'Test Domainification')
self.remove_from_active_domains(remove_all=True)

2
frappe/tests/test_dynamic_links.py
View file

@ -4,7 +4,7 @@ import frappe, unittest
class TestDynamicLinks(unittest.TestCase):
def setUp(self):
frappe.db.sql('delete from `tabEmail Unsubscribe`')
frappe.db.delete("Email Unsubscribe")
def test_delete_normal(self):
event = frappe.get_doc({

8
frappe/tests/test_email.py
View file

@ -7,9 +7,9 @@ test_dependencies = ['Email Account']
class TestEmail(unittest.TestCase):
def setUp(self):
frappe.db.sql("""delete from `tabEmail Unsubscribe`""")
frappe.db.sql("""delete from `tabEmail Queue`""")
frappe.db.sql("""delete from `tabEmail Queue Recipient`""")
frappe.db.delete("Email Unsubscribe")
frappe.db.delete("Email Queue")
frappe.db.delete("Email Queue Recipient")
def test_email_queue(self, send_after=None):
frappe.sendmail(recipients=['test@example.com', 'test1@example.com'],
@ -170,7 +170,7 @@ class TestEmail(unittest.TestCase):
import re
email_account = frappe.get_doc('Email Account', '_Test Email Account 1')
frappe.db.sql('''delete from `tabCommunication` where sender = 'sukh@yyy.com' ''')
frappe.db.delete("Communication", {"sender": "sukh@yyy.com"})
with open(frappe.get_app_path('frappe', 'tests', 'data', 'email_with_image.txt'), 'r') as raw:
mails = email_account.get_inbound_mails(test_mails=[raw.read()])

24
frappe/tests/test_frappe_client.py
View file

@ -12,7 +12,7 @@ import base64
class TestFrappeClient(unittest.TestCase):
def test_insert_many(self):
server = FrappeClient(get_url(), "Administrator", "admin", verify=False)
frappe.db.sql("delete from `tabNote` where title in ('Sing','a','song','of','sixpence')")
frappe.db.delete("Note", {"title": ("in", ('Sing','a','song','of','sixpence'))})
frappe.db.commit()
server.insert_many([
@ -31,7 +31,7 @@ class TestFrappeClient(unittest.TestCase):
def test_create_doc(self):
server = FrappeClient(get_url(), "Administrator", "admin", verify=False)
frappe.db.sql("delete from `tabNote` where title = 'test_create'")
frappe.db.delete("Note", {"title": "test_create"})
frappe.db.commit()
server.insert({"doctype": "Note", "public": True, "title": "test_create"})
@ -46,7 +46,7 @@ class TestFrappeClient(unittest.TestCase):
def test_get_doc(self):
server = FrappeClient(get_url(), "Administrator", "admin", verify=False)
frappe.db.sql("delete from `tabNote` where title = 'get_this'")
frappe.db.delete("Note", {"title": "get_this"})
frappe.db.commit()
server.insert_many([
@ -57,7 +57,7 @@ class TestFrappeClient(unittest.TestCase):
def test_get_value(self):
server = FrappeClient(get_url(), "Administrator", "admin", verify=False)
frappe.db.sql("delete from `tabNote` where title = 'get_value'")
frappe.db.delete("Note", {"title": "get_value"})
frappe.db.commit()
test_content = "test get value"
@ -82,7 +82,7 @@ class TestFrappeClient(unittest.TestCase):
def test_update_doc(self):
server = FrappeClient(get_url(), "Administrator", "admin", verify=False)
frappe.db.sql("delete from `tabNote` where title in ('Sing','sing')")
frappe.db.delete("Note", {"title": ("in" ("Sing", "sing"))})
frappe.db.commit()
server.insert({"doctype":"Note", "public": True, "title": "Sing"})
@ -94,12 +94,12 @@ class TestFrappeClient(unittest.TestCase):
def test_update_child_doc(self):
server = FrappeClient(get_url(), "Administrator", "admin", verify=False)
frappe.db.sql("delete from `tabContact` where first_name = 'George' and last_name = 'Steevens'")
frappe.db.sql("delete from `tabContact` where first_name = 'William' and last_name = 'Shakespeare'")
frappe.db.sql("delete from `tabCommunication` where reference_doctype = 'Event'")
frappe.db.sql("delete from `tabCommunication Link` where link_doctype = 'Contact'")
frappe.db.sql("delete from `tabEvent` where subject = 'Sing a song of sixpence'")
frappe.db.sql("delete from `tabEvent Participants` where reference_doctype = 'Contact'")
frappe.db.delete("Contact", {"first_name": "George", "last_name": "Steevens"})
frappe.db.delete("Contact", {"first_name": "William", "last_name": "Shakespeare"})
frappe.db.delete("Communication", {"reference_doctype": "Event"})
frappe.db.delete("Communication Link", {"link_doctype": "Contact"})
frappe.db.delete("Event", {"subject": "Sing a song of sixpence"})
frappe.db.delete("Event Participants", {"reference_doctype": "Contact"})
frappe.db.commit()
# create multiple contacts
@ -131,7 +131,7 @@ class TestFrappeClient(unittest.TestCase):
def test_delete_doc(self):
server = FrappeClient(get_url(), "Administrator", "admin", verify=False)
frappe.db.sql("delete from `tabNote` where title = 'delete'")
frappe.db.delete("Note", {"title": "delete"})
frappe.db.commit()
server.insert_many([

10
frappe/tests/test_global_search.py
View file

@ -24,15 +24,15 @@ class TestGlobalSearch(unittest.TestCase):
make_property_setter(doctype, "repeat_on", "in_global_search", 0, "Int")
def tearDown(self):
frappe.db.sql("DELETE FROM `tabProperty Setter` WHERE `doc_type`='Event'")
frappe.db.delete("Property Setter", {"doc_type": "Event"})
frappe.clear_cache(doctype='Event')
frappe.db.sql('DELETE FROM `tabEvent`')
frappe.db.sql('DELETE FROM `__global_search`')
frappe.db.delete("Event")
frappe.db.delete("__global_search")
make_test_objects('Event')
frappe.db.commit()
def insert_test_events(self):
frappe.db.sql('DELETE FROM `tabEvent`')
frappe.db.delete("Event")
phrases = ['"The Sixth Extinction II: Amor Fati" is the second episode of the seventh season of the American science fiction.',
'After Mulder awakens from his coma, he realizes his duty to prevent alien colonization. ',
'Carter explored themes of extraterrestrial involvement in ancient mass extinctions in this episode, the third in a trilogy.']
@ -97,7 +97,7 @@ class TestGlobalSearch(unittest.TestCase):
self.assertEqual(len(results), 0)
def test_insert_child_table(self):
frappe.db.sql('delete from tabEvent')
frappe.db.delete("Event")
phrases = ['Hydrus is a small constellation in the deep southern sky. ',
'It was first depicted on a celestial atlas by Johann Bayer in his 1603 Uranometria. ',
'The French explorer and astronomer Nicolas Louis de Lacaille charted the brighter stars and gave their Bayer designations in 1756. ',

2
frappe/tests/test_goal.py
View file

@ -13,7 +13,7 @@ class TestGoal(unittest.TestCase):
make_test_objects('Event', reset=True)
def tearDown(self):
frappe.db.sql('delete from `tabEvent`')
frappe.db.delete("Event")
# make_test_objects('Event', reset=True)
frappe.db.commit()

16
frappe/tests/test_naming.py
View file

@ -72,7 +72,7 @@ class TestNaming(unittest.TestCase):
current_index = frappe.db.sql("""SELECT current from `tabSeries` where name = %s""", series, as_dict=True)[0]
self.assertEqual(current_index.get('current'), 0)
frappe.db.sql("""delete from `tabSeries` where name = %s""", series)
frappe.db.delete("Series", {"name": series})
series = 'TEST-{}-'.format(year)
key = 'TEST-.YYYY.-.#####'
@ -82,40 +82,40 @@ class TestNaming(unittest.TestCase):
current_index = frappe.db.sql("""SELECT current from `tabSeries` where name = %s""", series, as_dict=True)[0]
self.assertEqual(current_index.get('current'), 1)
frappe.db.sql("""delete from `tabSeries` where name = %s""", series)
frappe.db.delete("Series", {"name": series})
series = 'TEST-'
key = 'TEST-'
name = 'TEST-00003'
frappe.db.sql("DELETE FROM `tabSeries` WHERE `name`=%s", series)
frappe.db.delete("Series", {"name": series})
frappe.db.sql("""INSERT INTO `tabSeries` (name, current) values (%s, 3)""", (series,))
revert_series_if_last(key, name)
current_index = frappe.db.sql("""SELECT current from `tabSeries` where name = %s""", series, as_dict=True)[0]
self.assertEqual(current_index.get('current'), 2)
frappe.db.sql("""delete from `tabSeries` where name = %s""", series)
frappe.db.delete("Series", {"name": series})
series = 'TEST1-'
key = 'TEST1-.#####.-2021-22'
name = 'TEST1-00003-2021-22'
frappe.db.sql("DELETE FROM `tabSeries` WHERE `name`=%s", series)
frappe.db.delete("Series", {"name": series})
frappe.db.sql("""INSERT INTO `tabSeries` (name, current) values (%s, 3)""", (series,))
revert_series_if_last(key, name)
current_index = frappe.db.sql("""SELECT current from `tabSeries` where name = %s""", series, as_dict=True)[0]
self.assertEqual(current_index.get('current'), 2)
frappe.db.sql("""delete from `tabSeries` where name = %s""", series)
frappe.db.delete("Series", {"name": series})
series = ''
key = '.#####.-2021-22'
name = '00003-2021-22'
frappe.db.sql("DELETE FROM `tabSeries` WHERE `name`=%s", series)
frappe.db.delete("Series", {"name": series})
frappe.db.sql("""INSERT INTO `tabSeries` (name, current) values (%s, 3)""", (series,))
revert_series_if_last(key, name)
current_index = frappe.db.sql("""SELECT current from `tabSeries` where name = %s""", series, as_dict=True)[0]
self.assertEqual(current_index.get('current'), 2)
frappe.db.sql("""delete from `tabSeries` where name = %s""", series)
frappe.db.delete("Series", {"name": series})
def test_naming_for_cancelled_and_amended_doc(self):
submittable_doctype = frappe.get_doc({

8
frappe/tests/test_permissions.py
View file

@ -38,7 +38,7 @@ class TestPermissions(unittest.TestCase):
reset('Blogger')
reset('Blog Post')
frappe.db.sql('delete from `tabUser Permission`')
frappe.db.delete("User Permission")
frappe.set_user("test1@example.com")
@ -334,9 +334,9 @@ class TestPermissions(unittest.TestCase):
doctype"""
frappe.set_user('Administrator')
frappe.db.sql('DELETE FROM `tabContact`')
frappe.db.sql('DELETE FROM `tabContact Email`')
frappe.db.sql('DELETE FROM `tabContact Phone`')
frappe.db.delete("Contact")
frappe.db.delete("Contact Email")
frappe.db.delete("Contact Phone")
reset('Salutation')
reset('Contact')

2
frappe/tests/test_scheduler.py
View file

@ -45,7 +45,7 @@ class TestScheduler(TestCase):
# 1st job is in the queue (or running), don't enqueue it again
self.assertFalse(job.enqueue())
frappe.db.sql('DELETE FROM `tabScheduled Job Log` WHERE `scheduled_job_type`=%s', job.name)
frappe.db.delete("Scheduled Job Log", {"scheduled_job_type": job.name})
def test_is_dormant(self):
self.assertTrue(is_dormant(check_time= get_datetime('2100-01-01 00:00:00')))