[5.2] Upmerge 2024-07-09 #43760
Merged
[5.2] Upmerge 2024-07-09 #43760
Conversation
This file contains 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
…#43656) - fixes issue joomla#43620 - if no 'rm' command is available on Windows - fixes issue joomla#43622 - if cmsPath is set - custom task 'deleteFolder' can also delete a file and ignores if the file does not exist -> exactly what we need - once PR is merged i will create the next PR to rename 'deleteFolder' as 'deleteRelativePath' and also 'writeFile' as 'writeRelativeFile' to better represent the functions
* cy-checkin * cs * less * cs * Update tests/System/integration/administrator/components/com_checkin/Default.cy.js Co-authored-by: Brian Teeman <brian@teeman.net> * Update tests/System/integration/administrator/components/com_checkin/Default.cy.js Co-authored-by: Brian Teeman <brian@teeman.net> --------- Co-authored-by: Brian Teeman <brian@teeman.net>
* cy.cache * Update tests/System/integration/administrator/components/com_cache/Default.cy.js Co-authored-by: Heiko Lübbe <github@heikol.de> * 4.4-only --------- Co-authored-by: Heiko Lübbe <github@heikol.de> Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
* [cypress] Rename deleteFolder to clarify function
- rename deleteFolder > deleteRelativePath
- to respect the custom task also deletes files and it does it relative to cmsPath
- rename writeFile > writeRelativeFile
- to unify task naming and to clarify it write relative to cmsPath
- additinal:
- small comment enhancements
- using const name 'path' from require('path');
- no functionality is changed, only method name, variable name and comment changes
- this is a follow-up to PR joomla#43656
- tested on branch dev-4.4 successfully
* Change to writeRelativeFile in 2 samples too
* cy.mails * Update tests/System/integration/administrator/components/com_mails/Templates.cy.js Co-authored-by: Brian Teeman <brian@teeman.net> --------- Co-authored-by: Brian Teeman <brian@teeman.net>
…43492) * Fail in case of SMTP problems with a clear message If the array `mail[]` is empty width length 0, the line `cy.wrap(mails).should('have.lengthOf', 1);` does not cause the test to stop in this case as the Cypress assertion inside the `.then()` has an asynchronous nature. The effect is that the test run continues and the following access to the mail fails with with a somehow incomprehensible message e.g. `TypeError: Cannot read properties of undefined (reading 'body')` Replaced it with an `expect` statement, which immediately triggers an error, and added an individual message that the SNMP configuration may need to be checked. Added two more places. * Remove custom failure msg from mail cnt assertion * Update tests/System/integration/administrator/components/com_config/Application.cy.js --------- Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
* Do real login test * more tests * cs * Clear the session * cs
* cy-actionlogs * cs * cs * test * test * noresult * cs * simplify * cs * Update tests/System/integration/administrator/components/com_actionlogs/Actionlogs.cy.js Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com> * Update tests/System/integration/administrator/components/com_actionlogs/Actionlogs.cy.js Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com> * desc * enabled-as-default --------- Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
* [4.4] Move the Cypress Tests to ESM * drone signature * resolve conflicts with joomla#43663 - part 2 * Fix path.join * Fix path.join - 2 * Fix import join from path * Remove the forgotten commented out orginial imports from plugin/index.js --------- Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
* [cypress] Update doc for cypress.config.[dist].mjs After PR joomla#43676 '[4.4] Move the Cypress Tests to ESM' the cypress config file is renamed to `.mjs`. This PR is for updating README and architecture pictures. * Update Code sample defaultCommandTimeout Update with Cypress defineConfig() syntax for new ESM * Explicit name cypress.config.mjs and use npm run 1. Error messages still mention `cypress.config.js`, e.g. on EADDRINUSE, even there is only `cypress.config.mjs` exisiting: ``` Your configFile threw an error from: cypress.config.js ``` This is avoided for `npm run cypress` by explicitly specifying the name `cypress.config.mjs`. 2. As this does not work for `npx cypress`, all given commands are changed to use `npm run cypress`.
* [4.4] Update file lists for cypress.config*.mjs With PR joomla#43676 '[4.4] Move the Cypress Tests to ESM' the Cypress config file is changed to `cypress.config.mjs`. There are places in source code tree with the old file names `*.js`, that are handled by: 1. In the script used to build Joomla distribution archive packages, in the ignore file list, the Cypress config file name has been changed to the new `.mjs`. 2. In the delete-file-that-should-not-exist list, `cypress.config.mjs`and `cypress.config.dist.mjs` have been added. * Fix typo * Reverted script.php add-ons See Conversation joomla#43703 (comment)
* Set permission for add-module-to-dashboard button * more precise access check * fix access for administrateo ---------
* Language update * Language update * Language update * Language update ---------
…oomla#43734) * Change redirect url (from headers['Location']) from array to string * Update SocketTransport.php
Co-authored-by: Benjamin Trenkle <bembelimen@users.noreply.github.com> Co-authored-by: Harald Leithner <leithner@itronic.at> Co-authored-by: Stefan Wendhausen <stefan.wendhausen@tec-promotion.de>
joomla-cms-bot
added
Language Change
|
Thanks @LadySolveig for the .drone.yml fix! |
Kostelano
added a commit
to JPathRu/localisation
that referenced
this pull request
Sep 19, 2024
joomla/joomla-cms#43232 + joomla/joomla-cms#43378 + joomla/joomla-cms#43216 + joomla/joomla-cms#43260 + joomla/joomla-cms#43386 + joomla/joomla-cms#43575 + joomla/joomla-cms#43491 + joomla/joomla-cms#43760 - (upmerge, внесено в 5.1х) joomla/joomla-cms#43247 + joomla/joomla-cms#43579 + joomla/joomla-cms#43690 + joomla/joomla-cms#43829 + joomla/joomla-cms#43840 + joomla/joomla-cms#43841 + joomla/joomla-cms#43885 - (upmerge, только для др. пакетов) joomla/joomla-cms#43223 + joomla/joomla-cms#43810 - (только для en-GB) joomla/joomla-cms#43898 + joomla/joomla-cms#43432 + joomla/joomla-cms#43870 + joomla/joomla-cms#42850 + joomla/joomla-cms#43937 - (upmerge, только для др. пакетов) joomla/joomla-cms#43862 + joomla/joomla-cms#43975 + joomla/joomla-cms#43910 + joomla/joomla-cms#43965 + joomla/joomla-cms#43738 + joomla/joomla-cms#43814 + joomla/joomla-cms#44000 + joomla/joomla-cms#44050 + (upmerge, с 4.4.9) joomla/joomla-cms#43966 + joomla/joomla-cms#44065 +
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
Testing Instructions
Actual result BEFORE applying this Pull Request
Expected result AFTER applying this Pull Request
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