Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[5.2] Fix multi-line comment indentation in system test javascript #44368

Merged
merged 1 commit into from
Oct 29, 2024

Conversation

richard67
Copy link
Member

@richard67 richard67 commented Oct 29, 2024

Pull Request for Issue # .

Summary of Changes

This pull request (PR) changes indentation of a multi-line comment in file tests/System/plugins/db.mjs.

The comment had been added with PR #44092 .

The javascript-cs check in Drone is ok with that comment in the 5.2-dev branch, but when doing the upmerge PR #44367 for the 5.3-dev branch I've noticed that it makes that check in Drone fail on that branch.

The reason for that difference is PR #44296 , which was merged in the 5.3-dev branch and updates our linter commands to support mjs.

I think it should be fixed in the 5.2-dev branch, so I've made this PR here. I will later care for the conflict in my upmerge PR when this one here will be merged before that one.

Testing Instructions

Code review, and check if the javascript-cs step passes in Drone.

Actual result BEFORE applying this Pull Request

The javascript-cs step passes in Drone.

The comment changed by this PR here is 2 spaces more indented than the code blockes above and below.

Expected result AFTER applying this Pull Request

The javascript-cs step still passes in Drone.

Indentation of the comment changed by this PR here is the same as for the code blockes above and below.

Link to documentations

Please select:

  • No documentation changes for docs.joomla.org needed

  • No documentation changes for manual.joomla.org needed

@laoneo laoneo merged commit 7db556c into joomla:5.2-dev Oct 29, 2024
3 checks passed
@laoneo
Copy link
Member

laoneo commented Oct 29, 2024

Thanks!

@laoneo laoneo added this to the Joomla! 5.2.1 milestone Oct 29, 2024
@richard67
Copy link
Member Author

Thanks for merging!

@richard67 richard67 deleted the 5.2-dev-javascript-cs-db-mjs branch October 29, 2024 12:31
# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants