From cd38017724c60d114b0400614967fbcb0056f9fa Mon Sep 17 00:00:00 2001 From: Christopher Ng Date: Wed, 2 Aug 2023 11:38:48 -0700 Subject: [PATCH 1/2] fix(cypress): Can delete a user Signed-off-by: Christopher Ng --- cypress/e2e/settings/users.cy.ts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/cypress/e2e/settings/users.cy.ts b/cypress/e2e/settings/users.cy.ts index 3a96f7546db10..9bc0c8ad65708 100644 --- a/cypress/e2e/settings/users.cy.ts +++ b/cypress/e2e/settings/users.cy.ts @@ -150,6 +150,20 @@ describe('Settings: Create and delete users', function() { cy.get('.action-item__popper .action').contains('Delete user').should('exist').click() // And confirmation dialog accepted cy.get('.oc-dialog button').contains(`Delete ${jdoe.userId}`).click() + + // Ignore failure if modal is not shown + cy.once('fail', (error) => { + expect(error.name).to.equal('AssertionError') + expect(error).to.have.property('node', '.modal-container') + }) + // Make sure no confirmation modal is shown + cy.get('body').find('.modal-container').then(($modal) => { + if ($modal.length > 0) { + cy.wrap($modal).find('input[type="password"]').type(admin.password) + cy.wrap($modal).find('button').contains('Confirm').click() + } + }) + // deleted clicked the user is not shown anymore cy.get(`tbody.user-list__body tr td[data-test="${jdoe.userId}"]`).parents('tr').should('not.be.visible') }) From 0f90c9423222dcfe28a3e1322772cf083ace9b77 Mon Sep 17 00:00:00 2001 From: Christopher Ng Date: Wed, 2 Aug 2023 11:38:48 -0700 Subject: [PATCH 2/2] fix(cypress): Show and hide columns Signed-off-by: Christopher Ng --- cypress/e2e/settings/usersUtils.ts | 33 ++++++++++++++++++++++++ cypress/e2e/settings/users_columns.cy.ts | 7 ++--- 2 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 cypress/e2e/settings/usersUtils.ts diff --git a/cypress/e2e/settings/usersUtils.ts b/cypress/e2e/settings/usersUtils.ts new file mode 100644 index 0000000000000..60ca42db7d9d2 --- /dev/null +++ b/cypress/e2e/settings/usersUtils.ts @@ -0,0 +1,33 @@ +/** + * @copyright 2023 Christopher Ng + * + * @author Christopher Ng + * + * @license AGPL-3.0-or-later + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +/** + * Assert that `element` does not exist or is not visible + * + * Useful in cases such as when NcModal is opened/closed rapidly + */ +export function assertNotExistOrNotVisible(element: JQuery) { + const doesNotExist = element.length === 0 + const isNotVisible = !element.is(':visible') + + expect(doesNotExist || isNotVisible, 'does not exist or is not visible').to.be.true +} diff --git a/cypress/e2e/settings/users_columns.cy.ts b/cypress/e2e/settings/users_columns.cy.ts index 84222cc7477ef..67363fb578a41 100644 --- a/cypress/e2e/settings/users_columns.cy.ts +++ b/cypress/e2e/settings/users_columns.cy.ts @@ -21,6 +21,7 @@ */ import { User } from '@nextcloud/cypress' +import { assertNotExistOrNotVisible } from './usersUtils.js' const admin = new User('admin', 'admin') @@ -43,7 +44,7 @@ describe('Settings: Show and hide columns', function() { // close the settings dialog cy.get('button.modal-container__close').click() }) - cy.waitUntil(() => cy.get('.modal-container').should('not.be.visible')) + cy.waitUntil(() => cy.get('.modal-container').should(el => assertNotExistOrNotVisible(el))) }) it('Can show a column', function() { @@ -68,7 +69,7 @@ describe('Settings: Show and hide columns', function() { // close the settings dialog cy.get('button.modal-container__close').click() }) - cy.waitUntil(() => cy.get('.modal-container').should('not.be.visible')) + cy.waitUntil(() => cy.get('.modal-container').should(el => assertNotExistOrNotVisible(el))) // see that the language column is in the header cy.get(`.user-list__header tr`).within(() => { @@ -103,7 +104,7 @@ describe('Settings: Show and hide columns', function() { // close the settings dialog cy.get('button.modal-container__close').click() }) - cy.waitUntil(() => cy.get('.modal-container').should('not.be.visible')) + cy.waitUntil(() => cy.get('.modal-container').should(el => assertNotExistOrNotVisible(el))) // see that the last login column is not in the header cy.get(`.user-list__header tr`).within(() => {