From 716452ea698c59b5f218fc40f8b76076876e3d95 Mon Sep 17 00:00:00 2001 From: Komal-Saraf0609 Date: Mon, 9 Aug 2021 16:48:49 +0530 Subject: [PATCH 1/3] test: Added test case for cancel functionality --- cypress/integration/timeline.js | 42 +++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/cypress/integration/timeline.js b/cypress/integration/timeline.js index 84616cfbe6..f16def0fa1 100644 --- a/cypress/integration/timeline.js +++ b/cypress/integration/timeline.js @@ -1,3 +1,6 @@ +import custom_submittable_doctype from '../fixtures/custom_submittable_doctype'; +const doctype_name = custom_submittable_doctype.name; + context('Timeline', () => { before(() => { cy.visit('/login'); @@ -50,4 +53,43 @@ context('Timeline', () => { cy.get('.menu-btn-group > .dropdown-menu > li > .grey-link').eq(17).click({force: true}); cy.get('.modal.show > .modal-dialog > .modal-content > .modal-footer > .standard-actions > .btn-primary').contains('Yes').click({force: true}); }); + + it('Cancel functionality for timeline', () => { + cy.visit('/app/doctype'); + + //Creating custom doctype + cy.insert_doc('DocType', custom_submittable_doctype, true); + + cy.visit('/app/custom-submittable-doctype'); + cy.click_listview_primary_button('Add Custom Submittable DocType'); + + //Adding a new entry for the created custom doctype + cy.fill_field('title','Test'); + cy.get('.modal.show > .modal-dialog > .modal-content > .modal-footer > .standard-actions > .btn-primary').click(); + cy.get('.modal-footer > .standard-actions > .btn-primary').contains('Submit').click(); + cy.visit('/app/custom-submittable-doctype'); + cy.get('.list-row > .level-left > .list-subject > .bold > .ellipsis').eq(0).click(); + + //To check if the submission of the documemt is visible in the timeline content + cy.get('.timeline-content').should('contain', 'Administrator submitted this document'); + cy.get('.page-head > .container > .row > .col > .standard-actions > .btn-secondary').contains('Cancel').click({delay: 900}); cy.get('.modal.show > .modal-dialog > .modal-content > .modal-footer > .standard-actions > .btn-primary').contains('Yes').click(); + + //To check if the cancellation of the documemt is visible in the timeline content + cy.get('.timeline-content').should('contain','Administrator cancelled this document'); + + //Deleting the document + cy.visit('/app/custom-submittable-doctype'); + cy.get('.list-row > .level-left > .list-subject > .select-like > .list-row-checkbox').eq(0).click(); + cy.get('.page-head > .container > .row > .col > .standard-actions > .actions-btn-group > .btn').contains('Actions').click(); + cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(7).click(); + cy.click_modal_primary_button('Yes', {force : true, delay: 700}); + + //Deleting the custom doctype + cy.visit('/app/doctype'); + cy.get('.list-row > .level-left > .list-subject > .select-like > .list-row-checkbox').eq(0).click(); + cy.get('.page-head > .container > .row > .col > .standard-actions > .actions-btn-group > .btn').contains('Actions').click(); + cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(5).click(); + cy.click_modal_primary_button('Yes'); + + }); }); \ No newline at end of file From eb669c16f6328d68fa98e2ed1b29772a89b38ce1 Mon Sep 17 00:00:00 2001 From: Komal-Saraf0609 Date: Mon, 9 Aug 2021 17:17:27 +0530 Subject: [PATCH 2/3] test: fixing sider issues --- cypress/integration/timeline.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/cypress/integration/timeline.js b/cypress/integration/timeline.js index f16def0fa1..415f85da00 100644 --- a/cypress/integration/timeline.js +++ b/cypress/integration/timeline.js @@ -1,5 +1,4 @@ import custom_submittable_doctype from '../fixtures/custom_submittable_doctype'; -const doctype_name = custom_submittable_doctype.name; context('Timeline', () => { before(() => { @@ -64,7 +63,7 @@ context('Timeline', () => { cy.click_listview_primary_button('Add Custom Submittable DocType'); //Adding a new entry for the created custom doctype - cy.fill_field('title','Test'); + cy.fill_field('title', 'Test'); cy.get('.modal.show > .modal-dialog > .modal-content > .modal-footer > .standard-actions > .btn-primary').click(); cy.get('.modal-footer > .standard-actions > .btn-primary').contains('Submit').click(); cy.visit('/app/custom-submittable-doctype'); @@ -75,21 +74,21 @@ context('Timeline', () => { cy.get('.page-head > .container > .row > .col > .standard-actions > .btn-secondary').contains('Cancel').click({delay: 900}); cy.get('.modal.show > .modal-dialog > .modal-content > .modal-footer > .standard-actions > .btn-primary').contains('Yes').click(); //To check if the cancellation of the documemt is visible in the timeline content - cy.get('.timeline-content').should('contain','Administrator cancelled this document'); + cy.get('.timeline-content').should('contain', 'Administrator cancelled this document'); //Deleting the document cy.visit('/app/custom-submittable-doctype'); cy.get('.list-row > .level-left > .list-subject > .select-like > .list-row-checkbox').eq(0).click(); cy.get('.page-head > .container > .row > .col > .standard-actions > .actions-btn-group > .btn').contains('Actions').click(); cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(7).click(); - cy.click_modal_primary_button('Yes', {force : true, delay: 700}); + cy.click_modal_primary_button('Yes', {force: true, delay: 700}); //Deleting the custom doctype cy.visit('/app/doctype'); cy.get('.list-row > .level-left > .list-subject > .select-like > .list-row-checkbox').eq(0).click(); cy.get('.page-head > .container > .row > .col > .standard-actions > .actions-btn-group > .btn').contains('Actions').click(); cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(5).click(); - cy.click_modal_primary_button('Yes'); + cy.click_modal_primary_button('Yes'); }); }); \ No newline at end of file From b46b5546f700d8f0d4a0dbe96ba06b5cd756e7e1 Mon Sep 17 00:00:00 2001 From: Komal-Saraf0609 Date: Mon, 9 Aug 2021 20:42:26 +0530 Subject: [PATCH 3/3] test: Corrected function description and shorten some of the selectors by removing unwanted classes --- cypress/integration/timeline.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/cypress/integration/timeline.js b/cypress/integration/timeline.js index 415f85da00..c7bbe29e5a 100644 --- a/cypress/integration/timeline.js +++ b/cypress/integration/timeline.js @@ -53,7 +53,7 @@ context('Timeline', () => { cy.get('.modal.show > .modal-dialog > .modal-content > .modal-footer > .standard-actions > .btn-primary').contains('Yes').click({force: true}); }); - it('Cancel functionality for timeline', () => { + it('Timeline should have submit and cancel activity information', () => { cy.visit('/app/doctype'); //Creating custom doctype @@ -64,31 +64,31 @@ context('Timeline', () => { //Adding a new entry for the created custom doctype cy.fill_field('title', 'Test'); - cy.get('.modal.show > .modal-dialog > .modal-content > .modal-footer > .standard-actions > .btn-primary').click(); + cy.get('.modal-footer > .standard-actions > .btn-primary').contains('Save').click(); cy.get('.modal-footer > .standard-actions > .btn-primary').contains('Submit').click(); cy.visit('/app/custom-submittable-doctype'); - cy.get('.list-row > .level-left > .list-subject > .bold > .ellipsis').eq(0).click(); + cy.get('.list-subject > .bold > .ellipsis').eq(0).click(); //To check if the submission of the documemt is visible in the timeline content cy.get('.timeline-content').should('contain', 'Administrator submitted this document'); - cy.get('.page-head > .container > .row > .col > .standard-actions > .btn-secondary').contains('Cancel').click({delay: 900}); cy.get('.modal.show > .modal-dialog > .modal-content > .modal-footer > .standard-actions > .btn-primary').contains('Yes').click(); + cy.get('.page-actions > .standard-actions > .btn-secondary').contains('Cancel').click({delay: 900}); + cy.get('.modal-footer > .standard-actions > .btn-primary').contains('Yes').click(); //To check if the cancellation of the documemt is visible in the timeline content cy.get('.timeline-content').should('contain', 'Administrator cancelled this document'); //Deleting the document cy.visit('/app/custom-submittable-doctype'); - cy.get('.list-row > .level-left > .list-subject > .select-like > .list-row-checkbox').eq(0).click(); - cy.get('.page-head > .container > .row > .col > .standard-actions > .actions-btn-group > .btn').contains('Actions').click(); + cy.get('.list-subject > .select-like > .list-row-checkbox').eq(0).click(); + cy.get('.page-actions > .standard-actions > .actions-btn-group > .btn').contains('Actions').click(); cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(7).click(); cy.click_modal_primary_button('Yes', {force: true, delay: 700}); //Deleting the custom doctype cy.visit('/app/doctype'); - cy.get('.list-row > .level-left > .list-subject > .select-like > .list-row-checkbox').eq(0).click(); - cy.get('.page-head > .container > .row > .col > .standard-actions > .actions-btn-group > .btn').contains('Actions').click(); + cy.get('.list-subject > .select-like > .list-row-checkbox').eq(0).click(); + cy.get('.page-actions > .standard-actions > .actions-btn-group > .btn').contains('Actions').click(); cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(5).click(); cy.click_modal_primary_button('Yes'); - }); }); \ No newline at end of file