From c221090c86ebadde936fb593c4bb9b54825d12da Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Herbinet?= <33763786+Jerome-Herbinet@users.noreply.github.com> Date: Mon, 29 Apr 2024 10:40:40 +0200 Subject: [PATCH] fix: unify bundle naming MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com> Signed-off-by: Andy Scherzinger --- cypress/e2e/settings/apps.cy.ts | 2 +- lib/private/App/AppStore/Bundles/EducationBundle.php | 2 +- tests/lib/App/AppStore/Bundles/EducationBundleTest.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cypress/e2e/settings/apps.cy.ts b/cypress/e2e/settings/apps.cy.ts index e9913cdc82f..0df073271ef 100644 --- a/cypress/e2e/settings/apps.cy.ts +++ b/cypress/e2e/settings/apps.cy.ts @@ -123,7 +123,7 @@ describe('Settings: App management', { testIsolation: true }, () => { cy.get('#app-category-your-bundles').find('.active').should('exist') // I see the app bundles cy.get('#apps-list').contains('tr', 'Enterprise bundle') - cy.get('#apps-list').contains('tr', 'Education Edition') + cy.get('#apps-list').contains('tr', 'Education bundle') // I see that the "Enterprise bundle" is disabled cy.get('#apps-list').contains('tr', 'Enterprise bundle').contains('button', 'Download and enable all') }) diff --git a/lib/private/App/AppStore/Bundles/EducationBundle.php b/lib/private/App/AppStore/Bundles/EducationBundle.php index a08d707b021..83fcf5309ca 100644 --- a/lib/private/App/AppStore/Bundles/EducationBundle.php +++ b/lib/private/App/AppStore/Bundles/EducationBundle.php @@ -10,7 +10,7 @@ class EducationBundle extends Bundle { * {@inheritDoc} */ public function getName() { - return $this->l10n->t('Education Edition'); + return $this->l10n->t('Education bundle'); } /** diff --git a/tests/lib/App/AppStore/Bundles/EducationBundleTest.php b/tests/lib/App/AppStore/Bundles/EducationBundleTest.php index a4508e6156b..2bed8b987fc 100644 --- a/tests/lib/App/AppStore/Bundles/EducationBundleTest.php +++ b/tests/lib/App/AppStore/Bundles/EducationBundleTest.php @@ -13,7 +13,7 @@ class EducationBundleTest extends BundleBase { parent::setUp(); $this->bundle = new EducationBundle($this->l10n); $this->bundleIdentifier = 'EducationBundle'; - $this->bundleName = 'Education Edition'; + $this->bundleName = 'Education bundle'; $this->bundleAppIds = [ 'dashboard', 'circles', -- 2.39.5