diff --git a/frappe/hooks.py b/frappe/hooks.py index 7162165ed0..50b5f8f42f 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -225,9 +225,7 @@ scheduler_events = { "frappe.monitor.flush", "frappe.integrations.doctype.google_calendar.google_calendar.sync", ], - "hourly": [ - "frappe.email.doctype.newsletter.newsletter.send_scheduled_email", - ], + "hourly": [], # Maintenance queue happen roughly once an hour but don't align with wall-clock time of *:00 # Use these for when you don't care about when the job runs but just need some guarantee for # frequency. diff --git a/frappe/tests/test_global_search.py b/frappe/tests/test_global_search.py index 069d2523a2..8009b34de1 100644 --- a/frappe/tests/test_global_search.py +++ b/frappe/tests/test_global_search.py @@ -199,9 +199,9 @@ class TestGlobalSearch(IntegrationTestCase): global_search.update_global_search_for_all_web_pages() global_search.sync_global_search() frappe.db.commit() - results = global_search.web_search("unsubscribe") - self.assertTrue("Unsubscribe" in results[0].content) + results = global_search.web_search("company") + self.assertTrue("About" in results[0].content) results = global_search.web_search( - text="unsubscribe", scope='manufacturing" UNION ALL SELECT 1,2,3,4,doctype from __global_search' + text="company", scope='manufacturing" UNION ALL SELECT 1,2,3,4,doctype from __global_search' ) self.assertTrue(results == [])