diff options
Diffstat (limited to 'cypress/e2e')
| -rw-r--r-- | cypress/e2e/settings/users.cy.ts | 7 | ||||
| -rw-r--r-- | cypress/e2e/settings/usersUtils.ts | 21 | ||||
| -rw-r--r-- | cypress/e2e/settings/users_columns.cy.ts | 14 | ||||
| -rw-r--r-- | cypress/e2e/settings/users_modify.cy.ts | 67 |
4 files changed, 66 insertions, 43 deletions
diff --git a/cypress/e2e/settings/users.cy.ts b/cypress/e2e/settings/users.cy.ts index faa69892e8c..5cafd77ea73 100644 --- a/cypress/e2e/settings/users.cy.ts +++ b/cypress/e2e/settings/users.cy.ts @@ -21,6 +21,7 @@ */ /// <reference types="cypress-if" /> import { User } from '@nextcloud/cypress' +import { getUserListRow, handlePasswordConfirmation } from './usersUtils' const admin = new User('admin', 'admin') const jdoe = new User('jdoe', 'jdoe') @@ -106,10 +107,10 @@ describe('Settings: Create and delete users', function() { handlePasswordConfirmation(admin.password) // see that the created user is in the list - cy.get('tbody.user-list__body tr[data-test="john"]').within(() => { + getUserListRow('john') // see that the list of users contains the user john - cy.contains('john').should('exist') - }) + .contains('john') + .should('exist') }) it('Can delete a user', function() { diff --git a/cypress/e2e/settings/usersUtils.ts b/cypress/e2e/settings/usersUtils.ts index 1e325fab47d..de0c28adcc4 100644 --- a/cypress/e2e/settings/usersUtils.ts +++ b/cypress/e2e/settings/usersUtils.ts @@ -22,17 +22,36 @@ /** * Assert that `element` does not exist or is not visible - * * Useful in cases such as when NcModal is opened/closed rapidly + * @param element Element that is inspected */ export function assertNotExistOrNotVisible(element: JQuery<HTMLElement>) { const doesNotExist = element.length === 0 const isNotVisible = !element.is(':visible') + // eslint-disable-next-line no-unused-expressions expect(doesNotExist || isNotVisible, 'does not exist or is not visible').to.be.true } /** + * Get the settings users list + * @return Cypress chainable object + */ +export function getUserList() { + return cy.get('[data-test-id="userList"]') +} + +/** + * Get the row entry for given userId within the settings users list + * + * @param userId the user to query + * @return Cypress chainable object + */ +export function getUserListRow(userId: string) { + return getUserList().find(`tr[data-test="${userId}"]`) +} + +/** * Handle the confirm password dialog (if needed) * @param adminPassword The admin password for the dialog */ diff --git a/cypress/e2e/settings/users_columns.cy.ts b/cypress/e2e/settings/users_columns.cy.ts index 31df0eacf78..68313a0b245 100644 --- a/cypress/e2e/settings/users_columns.cy.ts +++ b/cypress/e2e/settings/users_columns.cy.ts @@ -21,7 +21,7 @@ */ import { User } from '@nextcloud/cypress' -import { assertNotExistOrNotVisible } from './usersUtils.js' +import { assertNotExistOrNotVisible, getUserList } from './usersUtils.js' const admin = new User('admin', 'admin') @@ -77,8 +77,8 @@ describe('Settings: Show and hide columns', function() { }) // see that the language column is in all user rows - cy.get('tbody.user-list__body tr').each(($row) => { - cy.wrap($row).get('[data-test="language"]').should('exist') + getUserList().find('tbody tr').each(($row) => { + cy.wrap($row).get('[data-test-id="cell-language"]').should('exist') }) }) @@ -89,8 +89,8 @@ describe('Settings: Show and hide columns', function() { }) // see that the last login column is in all user rows - cy.get('tbody.user-list__body tr').each(($row) => { - cy.wrap($row).get('[data-test="lastLogin"]').should('exist') + getUserList().find('tbody tr').each(($row) => { + cy.wrap($row).get('[data-test-id="cell-lastLogin"]').should('exist') }) // open the settings dialog @@ -112,8 +112,8 @@ describe('Settings: Show and hide columns', function() { }) // see that the last login column is not in all user rows - cy.get('tbody.user-list__body tr').each(($row) => { - cy.wrap($row).get('[data-test="lastLogin"]').should('not.exist') + getUserList().find('tbody tr').each(($row) => { + cy.wrap($row).get('[data-test-id="cell-lastLogin"]').should('not.exist') }) }) }) diff --git a/cypress/e2e/settings/users_modify.cy.ts b/cypress/e2e/settings/users_modify.cy.ts index 987e21971fe..c08e9de2610 100644 --- a/cypress/e2e/settings/users_modify.cy.ts +++ b/cypress/e2e/settings/users_modify.cy.ts @@ -21,6 +21,7 @@ */ import { User } from '@nextcloud/cypress' +import { getUserListRow, handlePasswordConfirmation } from './usersUtils' const admin = new User('admin', 'admin') const jdoe = new User('jdoe', 'jdoe') @@ -34,16 +35,14 @@ describe('Settings: Change user properties', function() { }) beforeEach(function() { - cy.get(`tbody.user-list__body tr[data-test="${jdoe.userId}"]`).within(() => { - // reset edit mode for the user jdoe - cy.get('td.row__cell--actions .action-items > button:first-of-type') - .invoke('attr', 'title') - .then((title) => { - if (title === 'Done') { - cy.get('td.row__cell--actions .action-items > button:first-of-type').click() - } - }) - }) + // reset to read-only mode: try to find the edit button and click it if set to editing + getUserListRow(jdoe.userId) + .find('[data-test-id="cell-actions"]') + // replace with following (more error resilent) with nextcloud-vue 8 + // find('[data-test-id="button-toggleEdit"][data-test="true"]') + .find('button[aria-label="Done"]') + .if() + .click({ force: true }) }) after(() => { @@ -51,41 +50,45 @@ describe('Settings: Change user properties', function() { }) it('Can change the display name', function() { - cy.get(`tbody.user-list__body tr[data-test="${jdoe.userId}"]`).within(() => { - // see that the list of users contains the user jdoe - cy.contains(jdoe.userId).should('exist') + // see that the list of users contains the user jdoe + getUserListRow(jdoe.userId).should('exist') // toggle the edit mode for the user jdoe - cy.get('td.row__cell--actions .action-items > button:first-of-type').click() - }) + .find('[data-test-id="cell-actions"]') + .find('button[aria-label="Edit"]') + // replace with following (more error resilent) with nextcloud-vue 8 + // find('[data-test-id="button-toggleEdit"]') + .click({ force: true }) - cy.get(`tbody.user-list__body tr[data-test="${jdoe.userId}"]`).within(() => { + getUserListRow(jdoe.userId).within(() => { // set the display name - cy.get('input[data-test="displayNameField"]').should('exist').and('have.value', 'jdoe') - cy.get('input[data-test="displayNameField"]').clear() - cy.get('input[data-test="displayNameField"]').type('John Doe') - cy.get('input[data-test="displayNameField"]').should('have.value', 'John Doe') - cy.get('input[data-test="displayNameField"] ~ button').click() + cy.get('input[data-test-id="input-displayName"]').should('exist').and('have.value', 'jdoe') + cy.get('input[data-test-id="input-displayName"]').clear() + cy.get('input[data-test-id="input-displayName"]').type('John Doe') + cy.get('input[data-test-id="input-displayName"]').should('have.value', 'John Doe') + cy.get('input[data-test-id="input-displayName"] ~ button').click() // Make sure no confirmation modal is shown handlePasswordConfirmation(admin.password) // see that the display name cell is done loading - cy.get('.user-row-text-field.icon-loading-small').should('exist') - cy.waitUntil(() => cy.get('.user-row-text-field.icon-loading-small').should('not.exist'), { timeout: 10000 }) + cy.get('[data-test-id="input-displayName"]').should('have.attr', 'data-test-loading', 'true') + cy.waitUntil(() => cy.get('[data-test-id="input-displayName"]').should('have.attr', 'data-test-loading', 'false'), { timeout: 10000 }) }) // Success message is shown cy.get('.toastify.toast-success').contains(/Display.+name.+was.+successfully.+changed/i).should('exist') }) it('Can change the password', function() { - cy.get(`tbody.user-list__body tr[data-test="${jdoe.userId}"]`).within(() => { - // see that the list of users contains the user jdoe - cy.contains(jdoe.userId).should('exist') + // see that the list of users contains the user jdoe + getUserListRow(jdoe.userId).should('exist') // toggle the edit mode for the user jdoe - cy.get('td.row__cell--actions .action-items > button:first-of-type').click() - }) + .find('[data-test-id="cell-actions"]') + .find('button[aria-label="Edit"]') + // replace with following (more error resilent) with nextcloud-vue 8 + // find('[data-test-id="button-toggleEdit"]') + .click({ force: true }) - cy.get(`tbody.user-list__body tr[data-test="${jdoe.userId}"]`).within(() => { + getUserListRow(jdoe.userId).within(() => { // see that the password of user0 is "" cy.get('input[type="password"]').should('exist').and('have.value', '') // set the password for user0 to 123456 @@ -98,10 +101,10 @@ describe('Settings: Change user properties', function() { handlePasswordConfirmation(admin.password) // see that the password cell for user user0 is done loading - cy.get('.user-row-text-field.icon-loading-small').should('exist') - cy.waitUntil(() => cy.get('.user-row-text-field.icon-loading-small').should('not.exist'), { timeout: 10000 }) + cy.get('[data-test-id="input-password"]').should('have.attr', 'data-test-loading', 'true') + cy.waitUntil(() => cy.get('[data-test-id="input-password"]').should('have.attr', 'data-test-loading', 'false'), { timeout: 10000 }) // password input is emptied on change - cy.get('input[type="password"]').should('have.value', '') + cy.get('[data-test-id="input-password"]').should('have.value', '') }) // Success message is shown cy.get('.toastify.toast-success').contains(/Password.+successfully.+changed/i).should('exist') |