We have a pre-commit git hook, a QA test and an unit test (in xt/vue_tidy.t) to make sure .vue files will always be correctly formatted, but we don't have anything for the .js and .ts files that were pretty at the beginning but are no longer. It should be: t/cypress/**/*.ts koha-tmpl/intranet-tmpl/prog/js/vue/*.js koha-tmpl/intranet-tmpl/prog/js/vue/**/*.js (maybe exclude dist?) With the following command: yarn run prettier --trailing-comma es5 --arrow-parens avoid --write FILES
See https://gitlab.com/koha-community/qa-test-tools/-/issues/66
https://gitlab.com/koha-community/koha-testing-docker/-/issues/374
Created attachment 150508 [details] [review] Bug 33625: Add test
Created attachment 150509 [details] [review] Bug 33625: Pretty .js files for vue Test plan: = Koha = Apply the first patch, prove xt/vue_tidy.t and notice the failure Apply this patch, now it passes = QA test = Apply the change to the merge request linked with this qa-test-tools' issue: https://gitlab.com/koha-community/qa-test-tools/-/issues/62 inside your ktd container (at /kohadevbox/qa-test-tools/) Edit a .js within koha-tmpl/intranet-tmpl/prog/js/vue and a .ts file (cypress test) with something not pretty Commit and run the QA script => It's failing! Pretty the change, commit again, run the QA script => It's happy! = KTD - git hook = Go to the merge request linked with this ktd's issue: https://gitlab.com/koha-community/koha-testing-docker/-/issues/374 Copy the modified git hook to .git/hooks/ktd/pre-commit Edit a .js within koha-tmpl/intranet-tmpl/prog/js/vue and a .ts file (cypress test) with something not pretty Commit => Notice that the commit content is pretty!
Created attachment 150513 [details] [review] Bug 33625: Add test Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Created attachment 150514 [details] [review] Bug 33625: Pretty .js files for vue Test plan: = Koha = Apply the first patch, prove xt/vue_tidy.t and notice the failure Apply this patch, now it passes = QA test = Apply the change to the merge request linked with this qa-test-tools' issue: https://gitlab.com/koha-community/qa-test-tools/-/issues/62 inside your ktd container (at /kohadevbox/qa-test-tools/) Edit a .js within koha-tmpl/intranet-tmpl/prog/js/vue and a .ts file (cypress test) with something not pretty Commit and run the QA script => It's failing! Pretty the change, commit again, run the QA script => It's happy! = KTD - git hook = Go to the merge request linked with this ktd's issue: https://gitlab.com/koha-community/koha-testing-docker/-/issues/374 Copy the modified git hook to .git/hooks/ktd/pre-commit Edit a .js within koha-tmpl/intranet-tmpl/prog/js/vue and a .ts file (cypress test) with something not pretty Commit => Notice that the commit content is pretty! Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Straight to QA.. all working and a good improvement as per other bugs of a similar nature. Passing QA
Pushed to master for 23.05
Created attachment 151331 [details] [review] Bug 33625: Adjust test to deal with cypress tests Cypress test files were ignored. This patch also deals with files in git index only.
Created attachment 151332 [details] [review] Bug 33625: Tidy remaining cypress test files
Follow-ups pushed. Thanks
Enhancement - not backporting to 22.11.x