Skip to content

Conversation

web-padawan
Copy link
Member

Description

In preparation for #10066, let's merge two item test suites into single file so that we can later also add itemLabelGenerator tests there, rather creating a yet another test suite.

Note: added target labels mainly to make it easier to backport this feature to 24.10 if we decide to do that.

Type of change

  • Test

Copy link

@web-padawan web-padawan removed the request for review from sissbruecker September 26, 2025 11:38
@web-padawan web-padawan merged commit de1558d into main Sep 26, 2025
9 checks passed
@web-padawan web-padawan deleted the test/combo-box-item-tests-merge branch September 26, 2025 11:39
@vaadin-bot
Copy link
Collaborator

Hi @web-padawan and @web-padawan, when i performed cherry-pick to this commit to 24.9, i have encountered the following issue. Can you take a look and pick it manually?
Error Message:
Error: Command failed: git cherry-pick de1558d
error: could not apply de1558d... test: merge combo-box item renderer and class name generator tests (#10241)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

@vaadin-bot
Copy link
Collaborator

Hi @web-padawan and @web-padawan, when i performed cherry-pick to this commit to 24.8, i have encountered the following issue. Can you take a look and pick it manually?
Error Message:
Error: Command failed: git cherry-pick de1558d
error: could not apply de1558d... test: merge combo-box item renderer and class name generator tests (#10241)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants