Browse Source

fix: flaky Org Chart Test (#27971)

develop
Rucha Mahabal 3 years ago
committed by GitHub
parent
commit
8eacaddde7
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      cypress/integration/test_organizational_chart_desktop.js
  2. 2
      cypress/integration/test_organizational_chart_mobile.js
  3. 10
      erpnext/public/js/hierarchy_chart/hierarchy_chart_desktop.js

2
cypress/integration/test_organizational_chart_desktop.js

@ -24,7 +24,7 @@ context('Organizational Chart', () => {
cy.get('.frappe-control[data-fieldname=company] input').focus().as('input'); cy.get('.frappe-control[data-fieldname=company] input').focus().as('input');
cy.get('@input') cy.get('@input')
.clear({ force: true }) .clear({ force: true })
.type('Test Org Chart{enter}', { force: true }) .type('Test Org Chart{downarrow}{enter}', { force: true })
.blur({ force: true }); .blur({ force: true });
}); });
}); });

2
cypress/integration/test_organizational_chart_mobile.js

@ -25,7 +25,7 @@ context('Organizational Chart Mobile', () => {
cy.get('.frappe-control[data-fieldname=company] input').focus().as('input'); cy.get('.frappe-control[data-fieldname=company] input').focus().as('input');
cy.get('@input') cy.get('@input')
.clear({ force: true }) .clear({ force: true })
.type('Test Org Chart{enter}', { force: true }) .type('Test Org Chart{downarrow}{enter}', { force: true })
.blur({ force: true }); .blur({ force: true });
}); });
}); });

10
erpnext/public/js/hierarchy_chart/hierarchy_chart_desktop.js

@ -334,10 +334,12 @@ erpnext.HierarchyChart = class {
if (child_nodes) { if (child_nodes) {
$.each(child_nodes, (_i, data) => { $.each(child_nodes, (_i, data) => {
this.add_node(node, data); if (!$(`[id="${data.id}"]`).length) {
setTimeout(() => { this.add_node(node, data);
this.add_connector(node.id, data.id); setTimeout(() => {
}, 250); this.add_connector(node.id, data.id);
}, 250);
}
}); });
} }
} }

Loading…
Cancel
Save