[5.3] Upmerge changes from 5.2-dev 2025-02-05 #44822
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* [5.2] test user registration workflow * cs * fix
Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
… Client Tool (joomla#44656) * [Cypress] Remove Joomla command line dependency With the `SefPlugin.cy.js` test specification, the Joomla command line client tool was added to the Joomla system tests for the first time. This is an additional complexity and dependency. Especially if the test environment is containerised and Cypress container has no PHP installed. And PHP version needs to be 8.1 and additional modules like `php-simplexml` are needed. And with the Docker access rights, `configuration.php` must be opened for writing (`chmod 644`). And then there is the locally running Cypress GUI to be configured... Therefore switched from using the Joomla command line client tool to using the existing `config_setParameter` Cypress command. The original creator of [44253](joomla#44253) could not know as it is not documented (will be solved with another PR and together with enabling `mod_rewrite` and the `AllowOverride All` needed configuration). Since sometimes the first SEF test failed when the entire Joomla System Tests was performed, the following was implemented: * The operations of the `writeRelativeFile` Cypress task are wrapped in a Promise to ensure that they are only resolved when everything is done * The `config_setParameter` Cypress custom command to return a Cypress chainable * Chaining has been implemented everywhere in `SefPlugin.cy.js` For this test spec the Cypress best practice to use `beforeEach` to ensure tests is added to run independently from one another (and needed for other places in the Joomla System Tests – one more PR). As a small side effect the SEF test spec with 9 tests runs faster, e.g. 3 instead of 18 seconds before. Tested with own target Joomla 5.2-dev three times the single test spec on: * Intel macOS 15.2 using Apache/MariaDB * Apple Silicon macOS 15.2 using Apache/MariaDB * Windows 11 24H2 using Laragon/Apache/MySQL ``` npx cypress run --spec tests/System/integration/plugins/system/sef/SefPlugin.cy.js ``` And once the overall test suite: ``` npm run cypress:run ``` * writeRelativeFile() header adapted return Promise Thank @heekc29 for the hint * Delete cy.log in custom command --------- Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
Since `setSefDefaults` already returns a Promise (which Cypress understands and waits for), there's no need to wrap it in an anonymous function. Therefore, the code is simplified for more beauty. Thanks to @laoneo for the hint.
Joomla uses html not xhtml so it is not needed to close a `<br` with a `\`
…ess to version 6.4.15 (joomla#44805)
…3986) Co-authored-by: Robert Deutz <rdeutz@googlemail.com> Co-authored-by: Hannes Papenberg <info@joomlager.de>
joomla-cms-bot
added
Composer Dependency Changed
Language Change
Member
|
Thanks! |
Kostelano
added a commit
to JPathRu/localisation
that referenced
this pull request
Apr 14, 2025
joomla/joomla-cms#41496 - (upmerge с 5.2х) joomla/joomla-cms#42530 + joomla/joomla-cms#43994 - (upmerge с 5.2х) joomla/joomla-cms#44009 - (upmerge с 5.2х) joomla/joomla-cms#44010 - (upmerge с 5.2х) joomla/joomla-cms#44161 + joomla/joomla-cms#44187 - (upmerge с 5.2х) joomla/joomla-cms#44207 - (upmerge с 5.2х) joomla/joomla-cms#44271 + joomla/joomla-cms#44273 + joomla/joomla-cms#44288 - (только для en-GB) joomla/joomla-cms#44348 - (upmerge с 5.2х) joomla/joomla-cms#44366 + joomla/joomla-cms#44367 - (upmerge с 5.2х) joomla/joomla-cms#44434 - (upmerge с 5.2х) joomla/joomla-cms#44448 - (upmerge с 5.2х) joomla/joomla-cms#44462 + joomla/joomla-cms#44487 - (upmerge с 5.2х) joomla/joomla-cms#44587 + joomla/joomla-cms#44600 + joomla/joomla-cms#44604 + joomla/joomla-cms#44621 - (upmerge с 5.2х) joomla/joomla-cms#44623 + joomla/joomla-cms#44632 + joomla/joomla-cms#44640 - (позже был REVERT joomla/joomla-cms#44845) joomla/joomla-cms#44714 - (upmerge с 5.2х) joomla/joomla-cms#44756 + joomla/joomla-cms#44768 - (upmerge с 5.2х) joomla/joomla-cms#44792 - (только для en-GB) joomla/joomla-cms#44813 + joomla/joomla-cms#44822 - (upmerge с 5.2х) joomla/joomla-cms#44839 + joomla/joomla-cms#44871 + joomla/joomla-cms#44954 + joomla/joomla-cms#45034 - (upmerge с 5.2х) joomla/joomla-cms#45058 - (только для en-GB) joomla/joomla-cms#45064 + joomla/joomla-cms#45078 - (только для en-GB) joomla/joomla-cms#45130 - (upmerge с 5.2х) joomla/joomla-cms#45240 - (upmerge с 5.2х) joomla/joomla-cms#45246 - (только для др. пакетов)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
13 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request for Issue # .
Summary of Changes
This pull request (PR) merges the changes from 5.2-dev up into 5.3-dev which have been made since the last upmerge with PR #44768 .
Important hint for maintainers
This PR has to be merged with a merge commit, not a squash commit.
Testing Instructions
Review. Check the commits of this PR and those in the 5.2-dev branch.
Actual result BEFORE applying this Pull Request
5.3-dev branch is not up to date with 5.2-dev.
Expected result AFTER applying this Pull Request
5.3-dev branch is up to date with 5.2-dev.
Link to documentations
Please select:
Documentation link for docs.joomla.org:
No documentation changes for docs.joomla.org needed
Pull Request link for manual.joomla.org:
No documentation changes for manual.joomla.org needed