search

vaadin / cdi

CDI Integration for Vaadin
Apache License 2.0
41 stars 56 forks source link

test: Fixes CdiVaadinServletTest, broken due to missing servlet registration #420

Closed tepi closed 1 year ago

tepi commented 1 year ago

Fixes CdíVaadinServletTest which broke due to https://github.com/vaadin/flow/pull/15188 which assumes that vaadin servlet has been registered when Atmosphere is being initialized

CLAassistant commented 1 year ago

CLA assistant check
All committers have signed the CLA.

vaadin-bot commented 1 year ago

Hi @tepi and @mshabarov, when i performed cherry-pick to this commit to 14.1, i have encountered the following issue. Can you take a look and pick it manually? Error Message: Error: Command failed: git cherry-pick 7c29686a4b3e29b78b3af7293887155286e9971d error: could not apply 7c29686... test: Fixes CdiVaadinServletTest, broken due to missing servlet registration (#420) 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".