From 9c88a5c1e47c4c13caa1cb0a4e8c99584b64d0b5 Mon Sep 17 00:00:00 2001 From: Dan Feder Date: Mon, 21 Mar 2022 17:50:48 -0400 Subject: [PATCH] Remove bulk moderation modals in Cypress tests (#3769) * Try cypress unbind * Accept modal confirm on submit --- cypress/integration/07_admin_dataset_json_form.spec.js | 3 +++ cypress/integration/08_admin_views.spec.js | 7 +++++-- cypress/integration/10_workflow_transitions.spec.js | 1 + cypress/integration/11_admin_dataset_file_upload.spec.js | 4 ++++ cypress/support/helpers/dkan.js | 5 +++++ 5 files changed, 18 insertions(+), 2 deletions(-) diff --git a/cypress/integration/07_admin_dataset_json_form.spec.js b/cypress/integration/07_admin_dataset_json_form.spec.js index 3e501d6e76..4786e17c9b 100644 --- a/cypress/integration/07_admin_dataset_json_form.spec.js +++ b/cypress/integration/07_admin_dataset_json_form.spec.js @@ -48,6 +48,7 @@ context('Admin dataset json form', () => { cy.get('#edit-preview').should('not.exist') }) cy.get('#edit-submit').click({ force:true }) + cy.get('.button').contains('Yes').click({ force:true }); cy.get('.messages--status').should('contain','has been created') // Confirm the default dkan admin view is filtered to show only datasets. cy.visit(baseurl + "/admin/dkan/datasets") @@ -75,6 +76,7 @@ context('Admin dataset json form', () => { cy.get('#edit-preview').should('not.exist') }) cy.get('#edit-submit').click({ force:true }) + cy.get('.button').contains('Yes').click({ force:true }); cy.get('.messages--status').should('contain','has been updated') // Delete dataset. cy.visit(baseurl + "/admin/dkan/datasets") @@ -82,6 +84,7 @@ context('Admin dataset json form', () => { cy.get('#edit-action').select('Delete content',{ force: true }).should('have.value', 'node_delete_action') cy.get('#edit-node-bulk-form-0').check({ force:true }) cy.get('#edit-submit--2').click({ force:true }) + cy.get('.button').contains('Yes').click({ force:true }); cy.get('input[value="Delete"]').click({ force:true }) cy.get('.messages').should('contain','Deleted 1 content item.') }) diff --git a/cypress/integration/08_admin_views.spec.js b/cypress/integration/08_admin_views.spec.js index 6123e774c5..2d6560ea2e 100644 --- a/cypress/integration/08_admin_views.spec.js +++ b/cypress/integration/08_admin_views.spec.js @@ -56,7 +56,7 @@ context('Admin content and dataset views', () => { // Fill select2 field for publisher. cy.get('#edit-field-json-metadata-0-value-publisher-publisher-name + .select2') .find('.select2-selection') - .click({ force:true }); + .click({ force:true }) cy.get('input[aria-controls="select2-edit-field-json-metadata-0-value-publisher-publisher-name-results"]').type('DKANTEST Publisher{enter}') // End filling up publisher. cy.get('#edit-field-json-metadata-0-value-contactpoint-contactpoint-fn').type('DKANTEST Contact Name', { force:true } ) @@ -64,10 +64,11 @@ context('Admin content and dataset views', () => { // Fill select2 field for keyword. cy.get('#edit-field-json-metadata-0-value-keyword-keyword-0 + .select2') .find('.select2-selection') - .click({ force: true }); + .click({ force: true }) cy.get('input[aria-controls="select2-edit-field-json-metadata-0-value-keyword-keyword-0-results"]').type('open data{enter}') // End filling up keyword. cy.get('#edit-submit').click({ force:true }) + cy.get('.button').contains('Yes').click({ force:true }) cy.get('.messages--status').should('contain','has been created') cy.visit(baseurl + "/admin/dkan/datasets") cy.wait(2000) @@ -75,10 +76,12 @@ context('Admin content and dataset views', () => { cy.get('#edit-node-bulk-form-0').click({force:true}) cy.get('#edit-action').select('Archive current revision',{ force: true }).should('have.value', 'archive_current') cy.get('#edit-submit--2').click({ force:true }) + cy.get('.button').contains('Yes').click({ force:true }); cy.get('tbody > :nth-child(1) > .views-field-status').should('contain', 'Unpublished') cy.get('#edit-node-bulk-form-0').click({force:true}) cy.get('#edit-action').select('Publish latest revision',{ force: true }).should('have.value', 'publish_latest') cy.get('#edit-submit--2').click({ force:true }) + cy.get('.button').contains('Yes').click({ force:true }) cy.get('tbody > :nth-child(1) > .views-field-status').should('contain', 'Published') cy.get('tbody > :nth-child(1) > .views-field-nothing > a').invoke('attr', 'href').should('contain', '/edit') cy.get('tbody > :nth-child(1) > .views-field-nothing > a').click({ force: true }) diff --git a/cypress/integration/10_workflow_transitions.spec.js b/cypress/integration/10_workflow_transitions.spec.js index 628eb71523..aefcffb0a7 100644 --- a/cypress/integration/10_workflow_transitions.spec.js +++ b/cypress/integration/10_workflow_transitions.spec.js @@ -31,6 +31,7 @@ context('Draft datasets', () => { cy.get('h1.page-title').should('contain', dataset_title) cy.get('#edit-moderation-state-0-state').select('published') cy.get('#edit-submit').click() + cy.get('.button').contains('Yes').click({ force:true }) cy.get('.messages--status').should('contain', 'has been updated') // Ensure dataset is visible via public API with correct title diff --git a/cypress/integration/11_admin_dataset_file_upload.spec.js b/cypress/integration/11_admin_dataset_file_upload.spec.js index 4e593d86b2..036465b044 100644 --- a/cypress/integration/11_admin_dataset_file_upload.spec.js +++ b/cypress/integration/11_admin_dataset_file_upload.spec.js @@ -39,6 +39,8 @@ context('Admin dataset file upload', () => { .type(fileUrl, { force:true }) cy.get('#edit-submit') .click({ force:true }) + cy.get('.button').contains('Yes') + .click({ force:true }) cy.get('.messages--status') .should('contain','has been created') }) @@ -117,6 +119,8 @@ context('Admin dataset file upload', () => { .should('be.visible') cy.get('#edit-submit') .click({ force:true }) + cy.get('.button').contains('Yes') + .click({ force:true }) cy.get('.messages--status') .should('contain','has been created') }) diff --git a/cypress/support/helpers/dkan.js b/cypress/support/helpers/dkan.js index 7edb96fdbe..24db34920d 100644 --- a/cypress/support/helpers/dkan.js +++ b/cypress/support/helpers/dkan.js @@ -240,6 +240,11 @@ export function createDatasetWithModerationState(dataset_title, moderation_state // End filling up keyword. cy.get('#edit-submit') .click({ force:true }) + // Dialog will only show if we're using published, click yes. + if (moderation_state == 'published') { + cy.get('.button').contains('Yes') + .click({ force:true }) + } cy.get('.messages--status') .should('contain','has been created') cy.get('.messages--status a').click()