Tests fails because of typo in webform_cards submodule FunctionalJavaScript folder

aaron.ferris → made their first commit to this issue’s fork.

Think I got all of these, did a quick check for any other instances of FunctionalJavaScript and couldn't see any. MR raised.

I am stumped because committing this change causes every MR to have rebasing issues. For now, I reverted the change.

git checkout -b '3440366-modify-formula-injection' --track webform-3440366/'3440366-modify-formula-injection'
error: The following untracked working tree files would be overwritten by checkout:
	modules/webform_cards/tests/src/FunctionalJavaScript/WebformCardsAjaxJavaScriptTest.php
	modules/webform_cards/tests/src/FunctionalJavaScript/WebformCardsAutoForwardJavaScriptTest.php
	modules/webform_cards/tests/src/FunctionalJavaScript/WebformCardsDraftJavaScriptTest.php
	modules/webform_cards/tests/src/FunctionalJavaScript/WebformCardsProgressJavaScriptTest.php
	modules/webform_cards/tests/src/FunctionalJavaScript/WebformCardsStatesJavaScriptTest.php
	modules/webform_cards/tests/src/FunctionalJavaScript/WebformCardsToggleJavaScriptTest.php
	modules/webform_cards/tests/src/FunctionalJavaScript/WebformCardsUiJavaScriptTest.php
	modules/webform_cards/tests/src/FunctionalJavaScript/WebformCardsValidationJavaScriptTest.php
Please move or remove them before you switch branches.
Aborting

Weird, I wonder if using git mv has somehow caused that issue....

Raised a different MR, without using git mv (manual job of deleting the folder in one commit, adding a new folder in another). Not sure if that will help?

@jrockowitz You can add -f to your checkout to have it overwrite the existing files.

@aaron.ferris I don't think git mv will be different from deleting and re-creating. It can detect based on file similarity that it's the same file.

Yeah, have to honest I was sceptical if it would've made a difference but felt it worth a shot. Thanks.

@Liam Morland, I always appreciate your git-fu

Just helping out with triage where possible. This seems to be definitively fixed by #20/21, no?

I understand changing the namespace, but why the revert commit to rename them back?

It looks like the change was originally reverted on 6.2.x back on April 23, but wasn't on 6.x until June 24. Seems 6.x and 6.2.x are kept somewhat in sync.

Automatically closed - issue fixed for 2 weeks with no activity.

I'm running into the same issues on PHP 8.3 and Drupal 10.3

MR 464 doesn't seem to apply for me, so I created this patch.

This change was made and then reverted. @jrockowitz was it reverted because it made rebasing other merge requests difficult?

I think I kept running into rebase issues. I am willing to try this again via 6.3.x

Should this be considered a blocker for 6.3.x?

I think we should try again. I am pretty sure the patch caused some expected issues.

I am leaning toward the delete the directory, commit, recreate directory, and commit approach to be safe.

Sure. That separated approach could be put into the merge request. When the MR is merged, squashing the commits into one will have the same result.