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

Tikui, vue & cypress headless failling #11646

Closed
wants to merge 1 commit into from
Closed

Tikui, vue & cypress headless failling #11646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion ...h/jhipster/lite/generator/client/angular/security/jwt/domain/AngularJwtModuleFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ public class AngularJwtModuleFactory {
{
path: '',
loadComponent: () => import('./login/login.component'),
title: 'Login',
},\
""";

Expand Down
2 changes: 2 additions & 0 deletions src/main/java/tech/jhipster/lite/generator/client/tikui/domain/TikuiModuleFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,15 @@ public JHipsterModule buildModule(JHipsterModuleProperties properties) {
.packageJson()
.addDependency(packageName("@tikui/core"), COMMON)
.addDevDependency(packageName("@prettier/plugin-pug"), COMMON)
.addDevDependency(packageName("serve"), COMMON)
.addDevDependency(packageName("stylelint"), COMMON)
.addDevDependency(packageName("stylelint-config-concentric-order"), COMMON)
.addDevDependency(packageName("stylelint-config-standard-scss"), COMMON)
.addDevDependency(packageName("stylelint-order"), COMMON)
.addDevDependency(packageName("tikuidoc-tikui"), COMMON)
.addScript(scriptKey("build:tikui"), scriptCommand("tikui-core build"))
.addScript(scriptKey("dev:tikui"), scriptCommand("tikui-core serve"))
.addScript(scriptKey("tikui:serve-build"), scriptCommand("tikui-core build && serve -p 9005 {{ projectBuildDirectory }}/classes/public/style"))
.and()
.files()
.add(SOURCE.template("tikuiconfig.json"), to("tikuiconfig.json"))
Expand Down
2 changes: 1 addition & 1 deletion ...n/java/tech/jhipster/lite/generator/client/tools/cypress/domain/CypressModuleFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public JHipsterModule buildComponentTestsModule(JHipsterModuleProperties propert
.addScript(scriptKey("test:component"), scriptCommand("start-server-and-test start http://localhost:9000 'cypress open --e2e --config-file src/test/webapp/component/cypress-config.ts'"))
.addScript(
scriptKey("test:component:headless"),
scriptCommand("start-server-and-test start http://localhost:9000 'cypress run --headless --config-file src/test/webapp/component/cypress-config.ts'")
scriptCommand("start-server-and-test tikui:serve-build http://localhost:9005 start http://localhost:9000 'cypress run --headless --config-file src/test/webapp/component/cypress-config.ts'")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is not working using dev:tikui ?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(and maybe it will not work without Tikui module)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image
nope

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, it's a sass watch error caused by interruption from start server and tests T-T because Tikui use sass in watch mode directly

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe in the future we may fix this in Tikui Core directly to handle and do nothing on interruption signal

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will indeed not work if the tikui module has not been applied.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will tie cypress module to tikui module and it doesn't sound like a good idea :)

)
.and()
.context()
Expand Down
2 changes: 1 addition & 1 deletion .../tech/jhipster/lite/generator/client/tools/playwright/domain/PlaywrightModuleFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public JHipsterModule buildComponentTestsModule(JHipsterModuleProperties propert
.packageJson()
.addDevDependency(packageName("start-server-and-test"), COMMON)
.addScript(scriptKey("test:component"), scriptCommand("start-server-and-test start http://localhost:9000 'playwright test --ui --config src/test/webapp/component/playwright.config.ts'"))
.addScript(scriptKey("test:component:headless"), scriptCommand("start-server-and-test start http://localhost:9000 'playwright test --config src/test/webapp/component/playwright.config.ts'"))
.addScript(scriptKey("test:component:headless"), scriptCommand("start-server-and-test tikui:serve-build http://localhost:9005 start http://localhost:9000 'playwright test --config src/test/webapp/component/playwright.config.ts'"))
.and()
.context()
.put("reportSubDirectory", "component-tests")
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/generator/dependencies/common/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"prettier-plugin-organize-imports": "4.1.0",
"prettier-plugin-packagejson": "2.5.6",
"recursive-copy-cli": "1.0.20",
"serve": "14.2.4",
"start-server-and-test": "2.0.9",
"stylelint": "16.12.0",
"stylelint-config-concentric-order": "5.2.0",
Expand Down
1 change: 0 additions & 1 deletion ...ipster/lite/generator/client/angular/security/jwt/domain/AngularJwtModuleFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ void shouldBuildModule() {
{
path: '',
loadComponent: () => import('./login/login.component'),
title: 'Login',
},
"""
);
Expand Down
2 changes: 2 additions & 0 deletions src/test/java/tech/jhipster/lite/generator/client/tikui/domain/TikuiModuleFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,13 +147,15 @@ private static JHipsterModuleAsserter assertThatTikuiModule(ModuleFile proxyFile
return assertThatModuleWithFiles(module, packageJsonFile(), proxyFile, indexFile)
.hasFile("package.json")
.containing(nodeDependency("@tikui/core"))
.containing(nodeDependency("serve"))
.containing(nodeDependency("stylelint"))
.containing(nodeDependency("stylelint-config-concentric-order"))
.containing(nodeDependency("stylelint-config-standard-scss"))
.containing(nodeDependency("stylelint-order"))
.containing(nodeDependency("tikuidoc-tikui"))
.containing(nodeScript("build:tikui", "tikui-core build"))
.containing(nodeScript("dev:tikui", "tikui-core serve"))
.containing(nodeScript("tikui:serve-build", "tikui-core build && serve -p 9005 target/classes/public/style"))
.and()
.hasFiles("tikuiconfig.json", ".stylelintrc.json")
.hasFile(".gitignore")
Expand Down
2 changes: 1 addition & 1 deletion ...va/tech/jhipster/lite/generator/client/tools/cypress/domain/CypressModuleFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ void shouldBuildComponentTestsModule() {
.containing(
nodeScript(
"test:component:headless",
"start-server-and-test start http://localhost:9000 'cypress run --headless --config-file src/test/webapp/component/cypress-config.ts'"
"start-server-and-test tikui:serve-build http://localhost:9005 start http://localhost:9000 'cypress run --headless --config-file src/test/webapp/component/cypress-config.ts'"
)
)
.and()
Expand Down
2 changes: 1 addition & 1 deletion ...h/jhipster/lite/generator/client/tools/playwright/domain/PlaywrightModuleFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ void shouldBuildComponentTestsModule() {
.containing(
nodeScript(
"test:component:headless",
"start-server-and-test start http://localhost:9000 'playwright test --config src/test/webapp/component/playwright.config.ts'"
"start-server-and-test tikui:serve-build http://localhost:9005 start http://localhost:9000 'playwright test --config src/test/webapp/component/playwright.config.ts'"
)
)
.and()
Expand Down
Loading