From 64839ed21b0f6b316568ace46c77595cc74b7eb2 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Wed, 18 Oct 2023 15:19:11 +0200 Subject: [PATCH] fix(tests): Move leftover acceptance tests for users from drone to cypress Signed-off-by: Ferdinand Thiessen --- .drone.yml | 30 -- .github/workflows/cypress.yml | 6 +- .../settings/src/components/Users/UserRow.vue | 6 + cypress/e2e/settings/usersUtils.ts | 1 - cypress/e2e/settings/users_groups.cy.ts | 182 ++++++++- cypress/e2e/settings/users_modify.cy.ts | 266 ++++++++++-- cypress/support/commands.ts | 7 +- dist/settings-users-8351.js | 4 +- dist/settings-users-8351.js.map | 2 +- ...ings-vue-settings-apps-users-management.js | 4 +- ...-vue-settings-apps-users-management.js.map | 2 +- tests/acceptance/config/behat.yml | 2 - .../bootstrap/UsersSettingsContext.php | 379 ------------------ tests/acceptance/features/users.feature | 77 ---- 14 files changed, 417 insertions(+), 551 deletions(-) delete mode 100644 tests/acceptance/features/bootstrap/UsersSettingsContext.php delete mode 100644 tests/acceptance/features/users.feature diff --git a/.drone.yml b/.drone.yml index 914c3c74e7637..e2fb8e567dced 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1651,36 +1651,6 @@ trigger: - pull_request - push ---- -kind: pipeline -name: acceptance-users - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: acceptance-users - image: ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest - commands: - - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-users --selenium-server selenium:4444 allow-git-repository-modifications features/users.feature - -services: -- name: selenium - image: ghcr.io/nextcloud/continuous-integration-selenium:3.141.59 - environment: - # Reduce default log level for Selenium server (INFO) as it is too - # verbose. - JAVA_OPTS: -Dselenium.LOGGER.level=WARNING - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - --- kind: pipeline name: acceptance-apps diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index da653c8952db0..0502f1d63d3aa 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -23,7 +23,7 @@ jobs: steps: - name: Checkout app - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v3.5.2 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 - name: Check composer.json id: check_composer @@ -39,8 +39,8 @@ jobs: uses: skjnldsv/read-package-engines-version-actions@8205673bab74a63eb9b8093402fd9e0e018663a1 # v2.2 id: versions with: - fallbackNode: "^14" - fallbackNpm: "^7" + fallbackNode: "^20" + fallbackNpm: "^9" - name: Set up node ${{ steps.versions.outputs.nodeVersion }} uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1 diff --git a/apps/settings/src/components/Users/UserRow.vue b/apps/settings/src/components/Users/UserRow.vue index d62780d2b6102..3d771b0d4cc12 100644 --- a/apps/settings/src/components/Users/UserRow.vue +++ b/apps/settings/src/components/Users/UserRow.vue @@ -95,6 +95,8 @@