From e790b5e8b100b5e311512fe3ad4e7c1815da993c Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Thu, 9 Jun 2022 12:34:09 +0530
Subject: [PATCH] fix(minor): added UI test

---
 cypress/integration/control_data.js | 16 +++++++++++-----
 cypress/support/commands.js         | 15 +++++++++++++--
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/cypress/integration/control_data.js b/cypress/integration/control_data.js
index 01f9168667..78cece627b 100644
--- a/cypress/integration/control_data.js
+++ b/cypress/integration/control_data.js
@@ -34,6 +34,12 @@ context('Data Control', () => {
 			});
 		});
 	});
+
+	it('check custom formatters', () => {
+		cy.visit(`/app/doctype/User`);
+		cy.get('[data-fieldname="fields"] .grid-row[data-idx="2"] [data-fieldname="fieldtype"] .static-area').should('have.text', '🔵 Section Break');
+	});
+
 	it('Verifying data control by inputting different patterns for "Name" field', () => {
 		cy.new_form('Test Data Control');
 
@@ -54,7 +60,7 @@ context('Data Control', () => {
 
 		//Checking if the border color of the field changes to red
 		cy.get('.frappe-control[data-fieldname="name1"]').should('have.class', 'has-error');
-		cy.findByRole('button', {name: 'Save'}).click();
+		cy.save();
 
 		//Checking for the error message
 		cy.get('.modal-title').should('have.text', 'Message');
@@ -64,7 +70,7 @@ context('Data Control', () => {
 		cy.get_field('name1', 'Data').clear({force: true});
 		cy.fill_field('name1', 'Komal{}/!', 'Data');
 		cy.get('.frappe-control[data-fieldname="name1"]').should('have.class', 'has-error');
-		cy.findByRole('button', {name: 'Save'}).click();
+		cy.save();
 		cy.get('.modal-title').should('have.text', 'Message');
 		cy.get('.msgprint').should('have.text', 'Komal{}/! is not a valid Name');
 		cy.hide_dialog();
@@ -76,14 +82,14 @@ context('Data Control', () => {
 		cy.get_field('email', 'Data').clear({force: true});
 		cy.fill_field('email', 'komal', 'Data');
 		cy.get('.frappe-control[data-fieldname="email"]').should('have.class', 'has-error');
-		cy.findByRole('button', {name: 'Save'}).click();
+		cy.save();
 		cy.get('.modal-title').should('have.text', 'Message');
 		cy.get('.msgprint').should('have.text', 'komal is not a valid Email Address');
 		cy.hide_dialog();
 		cy.get_field('email', 'Data').clear({force: true});
 		cy.fill_field('email', 'komal@test', 'Data');
 		cy.get('.frappe-control[data-fieldname="email"]').should('have.class', 'has-error');
-		cy.findByRole('button', {name: 'Save'}).click();
+		cy.save();
 		cy.get('.modal-title').should('have.text', 'Message');
 		cy.get('.msgprint').should('have.text', 'komal@test is not a valid Email Address');
 		cy.hide_dialog();
@@ -125,4 +131,4 @@ context('Data Control', () => {
 		cy.get('.actions-btn-group > .dropdown-menu [data-label="Delete"]').click();
 		cy.click_modal_primary_button('Yes');
 	});
-});
\ No newline at end of file
+});
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index 6398018e10..d3b13127cb 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -27,6 +27,7 @@ import "cypress-real-events/support";
 //
 // -- This is will overwrite an existing command --
 // Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... });
+
 Cypress.Commands.add('login', (email, password) => {
 	if (!email) {
 		email = 'Administrator';
@@ -139,6 +140,10 @@ Cypress.Commands.add('create_records', doc => {
 		.then(r => r.message);
 });
 
+Cypress.Commands.add('open_doc', (doctype, name) => {
+	cy.visit(`/app/${doctype}/${name}`)
+});
+
 Cypress.Commands.add('set_value', (doctype, name, obj) => {
 	return cy.call('frappe.client.set_value', {
 		doctype,
@@ -265,9 +270,15 @@ Cypress.Commands.add('get_open_dialog', () => {
 	return cy.get('.modal:visible').last();
 });
 
+Cypress.Commands.add('save', () => {
+	cy.intercept('/api').as('api');
+	cy.get(`button[data-label="Save"]:visible`).click({scrollBehavior: false, force:true});
+	cy.wait('@api');
+});
+
 Cypress.Commands.add('hide_dialog', () => {
-	cy.wait(300);
-	cy.get_open_dialog().find('.btn-modal-close').click();
+	cy.wait(400);
+	cy.get_open_dialog().find('.btn-modal-close').click({force:true});
 	cy.get('.modal:visible').should('not.exist');
 });