Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

test: fix test ordering #20466

Merged
merged 3 commits into from
Nov 14, 2024
Merged

test: fix test ordering #20466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df92546
test: fix test ordering
mcollovati Nov 13, 2024
57f42a1
fix structure
mcollovati Nov 13, 2024
1b5717f
fix poms
mcollovati Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion flow-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@
<module>test-router-custom-context</module>
<module>test-live-reload</module>
<module>test-live-reload-multimodule</module>
<module>test-live-reload-multimodule/pom-devbundle.xml</module>
<module>test-live-reload-multimodule-devbundle</module>
<module>test-redeployment</module>
<module>test-redeployment-no-cache</module>

Expand Down
8 changes: 4 additions & 4 deletions flow-tests/test-frontend/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
<module>vite-basics</module>
<module>vite-production</module>
<module>vite-production-custom-frontend</module>
<module>vite-context-path/pom-production.xml</module>
<module>vite-context-path</module>
<module>vite-context-path/pom-production.xml</module>
<module>vite-pwa</module>
<module>vite-pwa-custom-offline-path</module>
<module>vite-pwa-custom-offline-path/pom-production.xml</module>
Expand All @@ -49,17 +49,17 @@
<module>vite-embedded-webcomponent-resync-ws</module>
<module>vite-embedded-webcomponent-resync-wsxhr</module>
<module>vite-embedded-webcomponent-resync-longpolling</module>
<module>test-npm/pom-production.xml</module>
<module>test-npm</module>
<module>test-pnpm/pom-production.xml</module>
<module>test-npm/pom-production.xml</module>
<module>test-pnpm</module>
<module>test-pnpm/pom-production.xml</module>
</modules>
</profile>
<profile>
<id>bun</id>
<modules>
<module>test-bun/pom-production.xml</module>
<module>test-bun</module>
<module>test-bun/pom-production.xml</module>
</modules>
</profile>
</profiles>
Expand Down
6 changes: 3 additions & 3 deletions ...live-reload-multimodule/pom-devbundle.xml → ...live-reload-multimodule-devbundle/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
</dependencies>

<modules>
<module>library/pom-devbundle.xml</module>
<module>ui/pom-devbundle.xml</module>
<module>theme/pom-devbundle.xml</module>
<module>../test-live-reload-multimodule/library/pom-devbundle.xml</module>
<module>../test-live-reload-multimodule/ui/pom-devbundle.xml</module>
<module>../test-live-reload-multimodule/theme/pom-devbundle.xml</module>
</modules>

</project>
2 changes: 1 addition & 1 deletion flow-tests/test-live-reload-multimodule/library/pom-devbundle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<artifactId>flow-test-live-reload-multimodule-devbundle</artifactId>
<groupId>com.vaadin</groupId>
<version>24.6-SNAPSHOT</version>
<relativePath>../pom-devbundle.xml</relativePath>
<relativePath>../../test-live-reload-multimodule-devbundle/pom.xml</relativePath>
</parent>
<artifactId>flow-test-live-reload-multimodule-library-devbundle</artifactId>
<name>The frontend library module for a live reload multi module project (dev bundle)</name>
Expand Down
2 changes: 1 addition & 1 deletion flow-tests/test-live-reload-multimodule/theme/pom-devbundle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<artifactId>flow-test-live-reload-multimodule-devbundle</artifactId>
<groupId>com.vaadin</groupId>
<version>24.6-SNAPSHOT</version>
<relativePath>../pom-devbundle.xml</relativePath>
<relativePath>../../test-live-reload-multimodule-devbundle/pom.xml</relativePath>
</parent>
<artifactId>flow-test-live-reload-multimodule-theme-devbundle</artifactId>
<name>The theme module for a live reload multi module project (dev bundle)</name>
Expand Down
2 changes: 1 addition & 1 deletion flow-tests/test-live-reload-multimodule/ui/pom-devbundle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<artifactId>flow-test-live-reload-multimodule-devbundle</artifactId>
<groupId>com.vaadin</groupId>
<version>24.6-SNAPSHOT</version>
<relativePath>../pom-devbundle.xml</relativePath>
<relativePath>../../test-live-reload-multimodule-devbundle/pom.xml</relativePath>
</parent>
<artifactId>flow-test-live-reload-multimodule-ui-devbundle</artifactId>
<name>The UI module for a live reload multi module project (dev bundle)</name>
Expand Down
8 changes: 5 additions & 3 deletions scripts/computeMatrix.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,14 @@ const moduleWeights = {
'flow-tests/vaadin-spring-tests/test-spring-security-flow-standalone-routepathaccesschecker': { pos: 5, weight: 3 },
'flow-tests/vaadin-spring-tests/test-spring-security-flow-routepathaccesschecker': { pos: 5, weight: 3 },
'flow-tests/vaadin-spring-tests/test-mvc-without-endpoints': { pos: 5, weight: 2 },
'flow-tests/test-live-reload-multimodule': {pos:6},
'flow-tests/test-live-reload-multimodule/ui': {pos:6},
'flow-tests/test-live-reload-multimodule/library': {pos:6},
'flow-tests/test-live-reload-multimodule/theme': {pos:6},
'flow-tests/test-live-reload-multimodule/ui/pom-devbundle.xml': {pos:6},
'flow-tests/test-live-reload-multimodule/library/pom-devbundle.xml': {pos:6},
'flow-tests/test-live-reload-multimodule/theme/pom-devbundle.xml': {pos:6},
'flow-tests/test-live-reload-multimodule-devbundle': {pos:6},
'flow-tests/test-live-reload-multimodule-devbundle/../test-live-reload-multimodule/ui/pom-devbundle.xml': {pos:6},
'flow-tests/test-live-reload-multimodule-devbundle/../test-live-reload-multimodule/library/pom-devbundle.xml': {pos:6},
'flow-tests/test-live-reload-multimodule-devbundle/../test-live-reload-multimodule/theme/pom-devbundle.xml': {pos:6},
'flow-tests/test-redeployment': { weight: 13 },
'flow-tests/test-pwa': { weight: 10 },
'flow-tests/test-frontend/vite-pwa-disabled-offline': { weight: 7 },
Expand Down
Loading