From 499385a6f6e3fd326d79588af4ed1453f645fcd2 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 26 Sep 2019 13:31:53 +0530 Subject: [PATCH 1/2] fix: update in cypress tests: list_view.js --- cypress/integration/list_view.js | 13 +++++++------ frappe/public/js/frappe/list/list_view.js | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/cypress/integration/list_view.js b/cypress/integration/list_view.js index 1cf7f4e6d8..fcae02919a 100644 --- a/cypress/integration/list_view.js +++ b/cypress/integration/list_view.js @@ -19,13 +19,14 @@ context('List View', () => { cy.route({ method: 'POST', url:'api/method/frappe.model.workflow.bulk_workflow_approval' - }).as('bulk-approval'); - cy.route({ - method: 'GET', - url:'api/method/frappe.desk.reportview.get*' - }).as('update-list'); + }).then(()=> { + cy.route({ + method: 'GET', + url:'api/method/frappe.desk.reportview.get' + }) + }).as('update-view'); cy.wrap(elements).contains('Approve').click(); - cy.wait(['@bulk-approval', '@update-list']); + cy.wait('@update-view'); cy.get('.list-row-container:visible').should('contain', 'Approved'); }); }); diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index d63cabfbfe..8753caff2f 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -129,7 +129,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { this.toggle_auto_refresh(false), item.action, this.toggle_auto_refresh(true) - ]) + ]); } const $item = this.page.add_actions_menu_item(item.label, action, item.standard); if (item.class) { From 2773313dcbca7f3071000df77fa603121a7c9ea2 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 26 Sep 2019 19:27:54 +0530 Subject: [PATCH 2/2] refactor: Remove redundant code --- frappe/tests/ui_test_helpers.py | 38 +++++++++++---------------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/frappe/tests/ui_test_helpers.py b/frappe/tests/ui_test_helpers.py index aaed05ca3a..4b5a854eb9 100644 --- a/frappe/tests/ui_test_helpers.py +++ b/frappe/tests/ui_test_helpers.py @@ -33,33 +33,19 @@ def create_if_not_exists(doc): @frappe.whitelist() def create_todo_records(): - if frappe.db.get_all('ToDo', {'description': 'this is first todo'}): - return + frappe.db.sql("DELETE FROM `tabToDo` WHERE name!=''") + + for number in range(1, 5): + frappe.get_doc({ + "doctype": "ToDo", + "date": add_to_date(now(), days=3), + "description": "this is {} todo".format(number) + }).insert() - frappe.get_doc({ - "doctype": "ToDo", - "date": add_to_date(now(), days=3), - "description": "this is first todo" - }).insert() - frappe.get_doc({ - "doctype": "ToDo", - "date": add_to_date(now(), days=-3), - "description": "this is second todo" - }).insert() - frappe.get_doc({ - "doctype": "ToDo", - "date": add_to_date(now(), months=2), - "description": "this is third todo" - }).insert() - frappe.get_doc({ - "doctype": "ToDo", - "date": add_to_date(now(), months=-2), - "description": "this is fourth todo" - }).insert() @frappe.whitelist() def setup_workflow(): - from frappe.workflow.doctype.workflow.test_workflow import create_todo_workflow - create_todo_workflow() - create_todo_records() - frappe.clear_cache() + from frappe.workflow.doctype.workflow.test_workflow import create_todo_workflow + create_todo_workflow() + create_todo_records() + frappe.clear_cache()