aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFerdinand Thiessen <opensource@fthiessen.de>2025-05-22 13:37:56 +0200
committerFerdinand Thiessen <opensource@fthiessen.de>2025-05-28 13:54:10 +0200
commitd535c377cfbf2f802f02e79ed7dad6e3a14cfcd0 (patch)
treec52ff11366f205cc361b07e0b47fc83799827c9f
parentf833e2d219feb4c29aae4d27c3abe81a7d04a42e (diff)
downloadnextcloud-server-d535c377cfbf2f802f02e79ed7dad6e3a14cfcd0.tar.gz
nextcloud-server-d535c377cfbf2f802f02e79ed7dad6e3a14cfcd0.zip
fix: recommended apps button test
Regression of https://github.com/nextcloud/server/pull/52703 where the `>` was added by accident and thus the button has a wrong label including the rest of the button HTML. Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
-rw-r--r--core/src/components/setup/RecommendedApps.vue9
-rw-r--r--cypress/e2e/core/setup.ts13
2 files changed, 16 insertions, 6 deletions
diff --git a/core/src/components/setup/RecommendedApps.vue b/core/src/components/setup/RecommendedApps.vue
index b31e4b54ca4..f2120c28402 100644
--- a/core/src/components/setup/RecommendedApps.vue
+++ b/core/src/components/setup/RecommendedApps.vue
@@ -38,17 +38,16 @@
<div class="dialog-row">
<NcButton v-if="showInstallButton && !installingApps"
- type="tertiary"
- role="link"
+ data-cy-setup-recommended-apps-skip
:href="defaultPageUrl"
- data-cy-setup-recommended-apps-skip>
+ variant="tertiary">
{{ t('core', 'Skip') }}
</NcButton>
<NcButton v-if="showInstallButton"
- type="primary"
+ data-cy-setup-recommended-apps-install
:disabled="installingApps || !isAnyAppSelected"
- data-cy-setup-recommended-apps-install>
+ variant="primary"
@click.stop.prevent="installApps">
{{ installingApps ? t('core', 'Installing apps …') : t('core', 'Install recommended apps') }}
</NcButton>
diff --git a/cypress/e2e/core/setup.ts b/cypress/e2e/core/setup.ts
index 498e908585c..a94fdde2b25 100644
--- a/cypress/e2e/core/setup.ts
+++ b/cypress/e2e/core/setup.ts
@@ -124,8 +124,19 @@ function sharedSetup() {
cy.location('pathname', { timeout: 10000 })
.should('include', '/core/apps/recommended')
+ // See the apps setup
+ cy.get('[data-cy-setup-recommended-apps]')
+ .should('be.visible')
+ .within(() => {
+ cy.findByRole('heading', { name: 'Recommended apps' })
+ .should('be.visible')
+ cy.findByRole('link', { name: 'Skip' })
+ .should('be.visible')
+ cy.findByRole('button', { name: 'Install recommended apps' })
+ .should('be.visible')
+ })
+
// Skip the setup apps
- cy.get('[data-cy-setup-recommended-apps]').should('be.visible')
cy.get('[data-cy-setup-recommended-apps-skip]').click()
// Go to files