Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions build/frontend-legacy/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build/frontend-legacy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"@nextcloud/logger": "^3.0.3",
"@nextcloud/moment": "^1.3.5",
"@nextcloud/password-confirmation": "^6.0.2",
"@nextcloud/paths": "^3.0.0",
"@nextcloud/paths": "^3.1.0",
"@nextcloud/router": "^3.1.0",
"@nextcloud/sharing": "^0.4.0",
"@nextcloud/upload": "^1.11.1",
Expand Down
37 changes: 27 additions & 10 deletions cypress/e2e/settings/users_groups.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,19 @@
*/

import { User } from '@nextcloud/e2e-test-server/cypress'
import { clearState } from '../../support/commonUtils.ts'
import { randomString } from '../../support/utils/randomString.ts'
import { assertNotExistOrNotVisible, getUserListRow, handlePasswordConfirmation, toggleEditButton } from './usersUtils.ts'

const admin = new User('admin', 'admin')

describe('Settings: Create groups', () => {
let groupName: string

after(() => {
cy.runOccCommand(`group:delete '${groupName!}'`)
})

before(() => {
cy.login(admin)
cy.visit('/settings/users')
Expand All @@ -18,7 +25,7 @@ describe('Settings: Create groups', () => {
it('Can create a group', () => {
cy.intercept('POST', '**/ocs/v2.php/cloud/groups').as('createGroups')

const groupName = randomString(7)
groupName = randomString(7)
// open the Create group menu
cy.get('button[aria-label="Create group"]').click()

Expand Down Expand Up @@ -49,8 +56,14 @@ describe('Settings: Assign user to a group', { testIsolation: false }, () => {
const groupName = randomString(7)
let testUser: User

after(() => cy.deleteUser(testUser))
after(() => {
cy.deleteUser(testUser)
cy.runOccCommand(`group:delete '${groupName}'`)
})

before(() => {
clearState()

cy.createRandomUser().then((user) => {
testUser = user
})
Expand Down Expand Up @@ -120,6 +133,9 @@ describe('Settings: Assign user to a group', { testIsolation: false }, () => {
describe('Settings: Delete an empty group', { testIsolation: false }, () => {
const groupName = randomString(7)

after(() => {
cy.runOccCommand(`group:delete '${groupName}'`, { failOnNonZeroExit: false })
})
before(() => {
cy.runOccCommand(`group:add '${groupName}'`)
cy.login(admin)
Expand Down Expand Up @@ -151,7 +167,8 @@ describe('Settings: Delete an empty group', { testIsolation: false }, () => {

it('deleted group is not shown anymore', () => {
// see that the list of groups does not contain the group
cy.get('ul[data-cy-users-settings-navigation-groups="custom"]').find('li').contains(groupName)
cy.get('ul[data-cy-users-settings-navigation-groups="custom"]')
.find('li')
.should('not.exist')
// and also not in database
cy.runOccCommand('group:list --output=json').then(($response) => {
Expand All @@ -165,6 +182,10 @@ describe('Settings: Delete a non empty group', () => {
let testUser: User
const groupName = randomString(7)

after(() => {
cy.runOccCommand(`group:delete '${groupName}'`, { failOnNonZeroExit: false })
})

before(() => {
cy.runOccCommand(`group:add '${groupName}'`)
cy.createRandomUser().then(($user) => {
Expand Down Expand Up @@ -202,7 +223,8 @@ describe('Settings: Delete a non empty group', () => {

it('deleted group is not shown anymore', () => {
// see that the list of groups does not contain the group foo
cy.get('ul[data-cy-users-settings-navigation-groups="custom"]').find('li').contains(groupName)
cy.get('ul[data-cy-users-settings-navigation-groups="custom"]')
.find('li')
.should('not.exist')
// and also not in database
cy.runOccCommand('group:list --output=json').then(($response) => {
Expand All @@ -215,12 +237,7 @@ describe('Settings: Delete a non empty group', () => {
describe('Settings: Sort groups in the UI', () => {
before(() => {
// Clear state
cy.runOccCommand('group:list --output json').then((output) => {
const groups = Object.keys(JSON.parse(output.stdout)).filter((group) => group !== 'admin')
groups.forEach((group) => {
cy.runOccCommand(`group:delete '${group}'`)
})
})
clearState()

// Add two groups and add one user to group B
cy.runOccCommand('group:add A')
Expand Down
2 changes: 1 addition & 1 deletion dist/1035-1035.js.license
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ This file is generated from multiple sources. Included packages:
- version: 3.0.3
- license: GPL-3.0-or-later
- @nextcloud/paths
- version: 3.0.0
- version: 3.1.0
- license: GPL-3.0-or-later
- @nextcloud/router
- version: 3.1.0
Expand Down
2 changes: 1 addition & 1 deletion dist/1140-1140.js.license
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ This file is generated from multiple sources. Included packages:
- version: 3.0.3
- license: GPL-3.0-or-later
- @nextcloud/paths
- version: 3.0.0
- version: 3.1.0
- license: GPL-3.0-or-later
- @nextcloud/router
- version: 3.1.0
Expand Down
2 changes: 1 addition & 1 deletion dist/1598-1598.js.license
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ This file is generated from multiple sources. Included packages:
- version: 3.0.3
- license: GPL-3.0-or-later
- @nextcloud/paths
- version: 3.0.0
- version: 3.1.0
- license: GPL-3.0-or-later
- @nextcloud/router
- version: 3.1.0
Expand Down
2 changes: 1 addition & 1 deletion dist/1764-1764.js.license
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ This file is generated from multiple sources. Included packages:
- version: 3.0.3
- license: GPL-3.0-or-later
- @nextcloud/paths
- version: 3.0.0
- version: 3.1.0
- license: GPL-3.0-or-later
- @nextcloud/router
- version: 3.1.0
Expand Down
2 changes: 1 addition & 1 deletion dist/2221-2221.js.license
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ This file is generated from multiple sources. Included packages:
- version: 3.0.3
- license: GPL-3.0-or-later
- @nextcloud/paths
- version: 3.0.0
- version: 3.1.0
- license: GPL-3.0-or-later
- @nextcloud/router
- version: 3.1.0
Expand Down
2 changes: 1 addition & 1 deletion dist/2457-2457.js.license
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ This file is generated from multiple sources. Included packages:
- version: 3.0.3
- license: GPL-3.0-or-later
- @nextcloud/paths
- version: 3.0.0
- version: 3.1.0
- license: GPL-3.0-or-later
- @nextcloud/router
- version: 3.1.0
Expand Down
2 changes: 1 addition & 1 deletion dist/2517-2517.js.license
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ This file is generated from multiple sources. Included packages:
- version: 1.3.5
- license: GPL-3.0-or-later
- @nextcloud/paths
- version: 3.0.0
- version: 3.1.0
- license: GPL-3.0-or-later
- @nextcloud/router
- version: 3.1.0
Expand Down
2 changes: 1 addition & 1 deletion dist/2915-2915.js.license
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ This file is generated from multiple sources. Included packages:
- version: 3.0.3
- license: GPL-3.0-or-later
- @nextcloud/paths
- version: 3.0.0
- version: 3.1.0
- license: GPL-3.0-or-later
- @nextcloud/router
- version: 3.1.0
Expand Down
2 changes: 1 addition & 1 deletion dist/3556-3556.js.license
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ This file is generated from multiple sources. Included packages:
- version: 3.0.3
- license: GPL-3.0-or-later
- @nextcloud/paths
- version: 3.0.0
- version: 3.1.0
- license: GPL-3.0-or-later
- @nextcloud/router
- version: 3.1.0
Expand Down
2 changes: 1 addition & 1 deletion dist/4271-4271.js.license
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ This file is generated from multiple sources. Included packages:
- version: 3.0.3
- license: GPL-3.0-or-later
- @nextcloud/paths
- version: 3.0.0
- version: 3.1.0
- license: GPL-3.0-or-later
- @nextcloud/router
- version: 3.1.0
Expand Down
2 changes: 1 addition & 1 deletion dist/4906-4906.js.license
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ This file is generated from multiple sources. Included packages:
- version: 3.0.3
- license: GPL-3.0-or-later
- @nextcloud/paths
- version: 3.0.0
- version: 3.1.0
- license: GPL-3.0-or-later
- @nextcloud/router
- version: 3.1.0
Expand Down
2 changes: 1 addition & 1 deletion dist/5448-5448.js.license
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ This file is generated from multiple sources. Included packages:
- version: 3.0.3
- license: GPL-3.0-or-later
- @nextcloud/paths
- version: 3.0.0
- version: 3.1.0
- license: GPL-3.0-or-later
- @nextcloud/router
- version: 3.1.0
Expand Down
2 changes: 1 addition & 1 deletion dist/7039-7039.js.license
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ This file is generated from multiple sources. Included packages:
- version: 3.0.3
- license: GPL-3.0-or-later
- @nextcloud/paths
- version: 3.0.0
- version: 3.1.0
- license: GPL-3.0-or-later
- @nextcloud/router
- version: 3.1.0
Expand Down
2 changes: 1 addition & 1 deletion dist/7910-7910.js.license
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ This file is generated from multiple sources. Included packages:
- version: 3.0.3
- license: GPL-3.0-or-later
- @nextcloud/paths
- version: 3.0.0
- version: 3.1.0
- license: GPL-3.0-or-later
- @nextcloud/router
- version: 3.1.0
Expand Down
2 changes: 1 addition & 1 deletion dist/8124-8124.js.license
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ This file is generated from multiple sources. Included packages:
- version: 3.0.3
- license: GPL-3.0-or-later
- @nextcloud/paths
- version: 3.0.0
- version: 3.1.0
- license: GPL-3.0-or-later
- @nextcloud/router
- version: 3.1.0
Expand Down
2 changes: 1 addition & 1 deletion dist/8192-8192.js.license
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ This file is generated from multiple sources. Included packages:
- version: 3.0.3
- license: GPL-3.0-or-later
- @nextcloud/paths
- version: 3.0.0
- version: 3.1.0
- license: GPL-3.0-or-later
- @nextcloud/router
- version: 3.1.0
Expand Down
2 changes: 1 addition & 1 deletion dist/9646-9646.js.license
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ This file is generated from multiple sources. Included packages:
- version: 6.0.2
- license: MIT
- @nextcloud/paths
- version: 3.0.0
- version: 3.1.0
- license: GPL-3.0-or-later
- @nextcloud/router
- version: 3.1.0
Expand Down
2 changes: 1 addition & 1 deletion dist/9906-9906.js.license
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ This file is generated from multiple sources. Included packages:
- version: 3.0.3
- license: GPL-3.0-or-later
- @nextcloud/paths
- version: 3.0.0
- version: 3.1.0
- license: GPL-3.0-or-later
- @nextcloud/router
- version: 3.1.0
Expand Down
2 changes: 1 addition & 1 deletion dist/comments-comments-app.js.license
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ This file is generated from multiple sources. Included packages:
- version: 3.0.3
- license: GPL-3.0-or-later
- @nextcloud/paths
- version: 3.0.0
- version: 3.1.0
- license: GPL-3.0-or-later
- @nextcloud/router
- version: 3.1.0
Expand Down
2 changes: 1 addition & 1 deletion dist/comments-comments-tab.js.license
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ This file is generated from multiple sources. Included packages:
- version: 1.3.5
- license: GPL-3.0-or-later
- @nextcloud/paths
- version: 3.0.0
- version: 3.1.0
- license: GPL-3.0-or-later
- @nextcloud/router
- version: 3.1.0
Expand Down
2 changes: 1 addition & 1 deletion dist/comments-init.js.license
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ This file is generated from multiple sources. Included packages:
- version: 3.0.3
- license: GPL-3.0-or-later
- @nextcloud/paths
- version: 3.0.0
- version: 3.1.0
- license: GPL-3.0-or-later
- @nextcloud/router
- version: 3.1.0
Expand Down
2 changes: 1 addition & 1 deletion dist/core-common.js.license
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ This file is generated from multiple sources. Included packages:
- version: 6.0.2
- license: MIT
- @nextcloud/paths
- version: 3.0.0
- version: 3.1.0
- license: GPL-3.0-or-later
- @nextcloud/router
- version: 3.1.0
Expand Down
2 changes: 1 addition & 1 deletion dist/core-common.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core-legacy-unified-search.js.license
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ This file is generated from multiple sources. Included packages:
- version: 3.0.3
- license: GPL-3.0-or-later
- @nextcloud/paths
- version: 3.0.0
- version: 3.1.0
- license: GPL-3.0-or-later
- @nextcloud/router
- version: 3.1.0
Expand Down
2 changes: 1 addition & 1 deletion dist/core-login.js.license
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ This file is generated from multiple sources. Included packages:
- version: 6.0.2
- license: MIT
- @nextcloud/paths
- version: 3.0.0
- version: 3.1.0
- license: GPL-3.0-or-later
- @nextcloud/router
- version: 3.1.0
Expand Down
2 changes: 1 addition & 1 deletion dist/core-main.js.license
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ This file is generated from multiple sources. Included packages:
- version: 6.0.2
- license: MIT
- @nextcloud/paths
- version: 3.0.0
- version: 3.1.0
- license: GPL-3.0-or-later
- @nextcloud/router
- version: 3.1.0
Expand Down
2 changes: 1 addition & 1 deletion dist/core-public-page-menu.js.license
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ This file is generated from multiple sources. Included packages:
- version: 3.0.3
- license: GPL-3.0-or-later
- @nextcloud/paths
- version: 3.0.0
- version: 3.1.0
- license: GPL-3.0-or-later
- @nextcloud/router
- version: 3.1.0
Expand Down
2 changes: 1 addition & 1 deletion dist/core-public-page-user-menu.js.license
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ This file is generated from multiple sources. Included packages:
- version: 3.0.3
- license: GPL-3.0-or-later
- @nextcloud/paths
- version: 3.0.0
- version: 3.1.0
- license: GPL-3.0-or-later
- @nextcloud/router
- version: 3.1.0
Expand Down
2 changes: 1 addition & 1 deletion dist/files-init.js.license
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ This file is generated from multiple sources. Included packages:
- version: 3.0.3
- license: GPL-3.0-or-later
- @nextcloud/paths
- version: 3.0.0
- version: 3.1.0
- license: GPL-3.0-or-later
- @nextcloud/router
- version: 3.1.0
Expand Down
2 changes: 1 addition & 1 deletion dist/files-main.js.license
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ This file is generated from multiple sources. Included packages:
- version: 3.0.3
- license: GPL-3.0-or-later
- @nextcloud/paths
- version: 3.0.0
- version: 3.1.0
- license: GPL-3.0-or-later
- @nextcloud/router
- version: 3.1.0
Expand Down
Loading
Loading