diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5c762d922..6822ade7d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,8 +23,8 @@ jobs: cache: 'maven' - run: ./mvnw clean spotless:check - unit-tests: - name: "Run unit tests" + unit-tests-java: + name: "Run unit test(Java)" runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -33,7 +33,19 @@ jobs: distribution: 'temurin' java-version: '17' cache: 'maven' - - run: ./mvnw clean test -Dskip.pnpm -Dskip.installnodepnpm + - run: ./mvnw clean test -Dskip.pnpm -Dskip.installnodepnpm -Dskip.pnpm.test + + unit-tests-ts: + name: "Run unit tests(Vue/Typescript)" + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '17' + cache: 'maven' + - run: ./mvnw -pl bigtop-manager-ui test build: name: "Build project" diff --git a/bigtop-manager-ui/.gitignore b/bigtop-manager-ui/.gitignore index 401fa5244..d63b3688d 100644 --- a/bigtop-manager-ui/.gitignore +++ b/bigtop-manager-ui/.gitignore @@ -6,6 +6,7 @@ yarn-debug.log* yarn-error.log* pnpm-debug.log* lerna-debug.log* +package-lock.json node node_modules diff --git a/bigtop-manager-ui/package.json b/bigtop-manager-ui/package.json index 6cf75363e..71035f4c8 100644 --- a/bigtop-manager-ui/package.json +++ b/bigtop-manager-ui/package.json @@ -7,8 +7,8 @@ "preview": "vite preview", "lint": "eslint src --fix --ext .ts,.tsx,.vue", "prettier": "prettier --write \"src/**/*.{vue,ts,tsx}\"", - "test:unit": "vitest", - "test": "vitest" + "test": "vitest", + "test:run": "vitest run" }, "dependencies": { "@ant-design/icons-vue": "^6.1.0", diff --git a/bigtop-manager-ui/pom.xml b/bigtop-manager-ui/pom.xml index 010537fb4..23cc14add 100644 --- a/bigtop-manager-ui/pom.xml +++ b/bigtop-manager-ui/pom.xml @@ -34,6 +34,7 @@ v18.17.0 v8.6.9 1.13.4 + false @@ -63,7 +64,7 @@ generate-resources - install --force + install @@ -76,6 +77,17 @@ build + + pnpm test + + pnpm + + test + + test:run + ${skip.pnpm.test} + +