diff --git a/src/javascript/components/actions/VanityAction.jsx b/src/javascript/components/actions/VanityAction.jsx index 552164c2..1fdae1c8 100644 --- a/src/javascript/components/actions/VanityAction.jsx +++ b/src/javascript/components/actions/VanityAction.jsx @@ -39,7 +39,7 @@ export const VanityAction = ({render: Render, loading: Loading, label, requiredP return ( <> Zusätzlich, einschließlich Vanity-URLs Dashboard. label.permission.viewVanityUrlModal.description=Bearbeiten Sie Vanity-URLs für Website siteSettingsSeo.title=URL-Mappings diff --git a/src/main/resources/resources/site-settings-seo_en.properties b/src/main/resources/resources/site-settings-seo_en.properties index 64c59b19..ed57dbbc 100644 --- a/src/main/resources/resources/site-settings-seo_en.properties +++ b/src/main/resources/resources/site-settings-seo_en.properties @@ -1,6 +1,5 @@ jnt_siteSettingsSeo=SEO -label.permission.siteAdminUrlmapping=Site admin url mapping -label.permission.siteAdminUrlmapping.description=Allows you to manage vanity URLs of a site -label.permission.siteAdminUrlmapping=Site admin url mapping +label.permission.siteAdminUrlmapping=SEO & Vanity URLs +label.permission.siteAdminUrlmapping.description=Access to SEO features in jContent => Additional, including vanity URLs dashboard label.permission.viewVanityUrlModal.description=Edit Vanity URLs for site siteSettingsSeo.title=Vanity URLs diff --git a/src/main/resources/resources/site-settings-seo_fr.properties b/src/main/resources/resources/site-settings-seo_fr.properties index 25075945..990ca582 100644 --- a/src/main/resources/resources/site-settings-seo_fr.properties +++ b/src/main/resources/resources/site-settings-seo_fr.properties @@ -1,6 +1,5 @@ jnt_siteSettingsSeo=SEO -label.permission.siteAdminUrlmapping=Site admin url mapping -label.permission.siteAdminUrlmapping.description=Permet de gérer les mapping d'URLs d'un site -label.permission.siteAdminUrlmapping=Site admin url mapping +label.permission.siteAdminUrlmapping=SEO & URL personnalisées +label.permission.siteAdminUrlmapping.description=Accès aux fonctionnalités SEO dans jContent => Extensions, y compris le tableau de bord des URLs personnalisées. label.permission.viewVanityUrlModal.description=Modifier les URL personnalisées pour le site siteSettingsSeo.title=URL personnalisées diff --git a/tests/cypress/e2e/permissions/checkUisPermissions.cy.ts b/tests/cypress/e2e/permissions/checkUisPermissions.cy.ts index aabb3388..26f0f166 100644 --- a/tests/cypress/e2e/permissions/checkUisPermissions.cy.ts +++ b/tests/cypress/e2e/permissions/checkUisPermissions.cy.ts @@ -104,15 +104,13 @@ describe('Test UIs permissions', () => { cy.logout() }) - it('Verify that user have access to vanity url in content editor in read only', function () { + it('Verify that user have no access to vanity url modal in content editor in read only', function () { cy.login('secondEditorUser', 'password') const composer = new PageComposer() PageComposer.visit(siteKey, 'en', 'home.html') composer.editPage(`${pageName}-a`) const contenteditor = new ContentEditorSEO() - const vanityUrlUi = contenteditor.openVanityUrlUi() - vanityUrlUi.findReadOnlyBadge().should('exist') - vanityUrlUi.getVanityUrlRow('/vanityOnPageA').should('exist') + contenteditor.checkVanityUrlAccessibility('false') cy.logout() }) }) diff --git a/tests/cypress/page-object/ContentEditorSEO.ts b/tests/cypress/page-object/ContentEditorSEO.ts index c5391ebb..c2ba552e 100644 --- a/tests/cypress/page-object/ContentEditorSEO.ts +++ b/tests/cypress/page-object/ContentEditorSEO.ts @@ -11,4 +11,9 @@ export class ContentEditorSEO extends ContentEditor { cy.get('li[data-sel-role="vanityUrls"]').click() return new VanityUrlUi() } + + checkVanityUrlAccessibility(enabled) { + cy.get('button[data-sel-role="3dotsMenuAction"]').click() + cy.get('li[data-sel-role="vanityUrls"]').should('have.attr', 'aria-disabled', enabled) + } }