Merge branch '4.3-dev' into add_ldap_tests

joomla · Sep 15, 2022 · 720e7c2 · 720e7c2
2 parents df4d1e8 + 72ec7d0
commit 720e7c2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/administrator/language/en-GB/com_users.sys.ini b/administrator/language/en-GB/com_users.sys.ini
@@ -47,7 +47,7 @@ COM_USERS_PROFILE_EDIT_DEFAULT_TITLE="Edit User Profile"
 COM_USERS_PROFILE_VIEW_DEFAULT_DESC="Displays a user profile."
 COM_USERS_PROFILE_VIEW_DEFAULT_OPTION="User Profile"
 COM_USERS_PROFILE_VIEW_DEFAULT_TITLE="User Profile"
-COM_USERS_REGISTRATION_VIEW_DEFAULT_DESC="Displays a registration form."
+COM_USERS_REGISTRATION_VIEW_DEFAULT_DESC="Displays a registration form. Allow User Registration must be enabled in the user options."
 COM_USERS_REGISTRATION_VIEW_DEFAULT_OPTION="Default"
 COM_USERS_REGISTRATION_VIEW_DEFAULT_TITLE="Registration Form"
 COM_USERS_REMIND_VIEW_DEFAULT_DESC="Displays a username reminder request."

diff --git a/cypress.config.js b/cypress.config.js
@@ -9,7 +9,11 @@ module.exports = defineConfig({
   e2e: {
     setupNodeEvents(on, config) {},
     baseUrl: 'http://localhost/',
-    specPattern: 'tests/cypress/integration/**/*.cy.{js,jsx,ts,tsx}',
+    specPattern: [
+      'tests/cypress/integration/install/*.cy.{js,jsx,ts,tsx}',
+      'tests/cypress/integration/administrator/**/*.cy.{js,jsx,ts,tsx}',
+      'tests/cypress/integration/site/**/*.cy.{js,jsx,ts,tsx}'
+    ],
     supportFile: 'tests/cypress/support/index.js',
     scrollBehavior: 'center',
     browser: 'firefox',

diff --git a/...ress/integration/00-install/install.cy.js → ...cypress/integration/install/install.cy.js b/...ress/integration/00-install/install.cy.js → ...cypress/integration/install/install.cy.js