diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ee79c335..027089f6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -39,4 +39,4 @@ jobs:
run: chmod +x gradlew
- name: Build (includes React build)
- run: ./gradlew clean bootJar --no-daemon
+ run: ./gradlew clean build --no-daemon
diff --git a/build.gradle b/build.gradle
index ab95fdfd..02d8e48e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,6 +23,12 @@ dependencies {
implementation libs.org.mybatis.spring.boot.mybatis.spring.boot.starter
runtimeOnly libs.org.springframework.boot.spring.boot.devtools
+ // Test
+ testImplementation libs.org.junit.jupiter.junit.jupiter
+ testImplementation libs.org.mockito.mockito.junit.jupiter
+ testImplementation libs.org.assertj.assertj.core
+
+
// JPA
implementation libs.org.springframework.boot.spring.boot.starter.data.jpa
@@ -77,6 +83,10 @@ tasks.withType(Javadoc) {
options.encoding = 'UTF-8'
}
+tasks.test {
+ useJUnitPlatform()
+}
+
def frontendDir = "$projectDir/src/main/frontend"
def querydslDir = layout.buildDirectory.dir("generated/querydsl").get().asFile
def reactBuildDir = layout.buildDirectory.dir("frontend").get().asFile
@@ -138,4 +148,4 @@ tasks.register('copyReactBuildFiles', Copy) {
dependsOn "buildReact"
from "$frontendDir/build"
into reactBuildDir
-}
\ No newline at end of file
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1853abaa..5a6b9b7f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -42,3 +42,6 @@ org-springframework-boot-spring-boot-starter-tomcat = { module = "org.springfram
org-springframework-boot-spring-boot-starter-web = { module = "org.springframework.boot:spring-boot-starter-web", version.ref = "org-springframework-boot-spring-boot-starter-web" }
org-springframework-security-spring-security-test = { module = "org.springframework.security:spring-security-test", version.ref = "org-springframework-security-spring-security-test" }
org-webjars-jquery = { module = "org.webjars:jquery", version.ref = "org-webjars-jquery" }
+org-junit-jupiter-junit-jupiter = { module = "org.junit.jupiter:junit-jupiter" }
+org-mockito-mockito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter" }
+org-assertj-assertj-core = { module = "org.assertj:assertj-core" }
diff --git a/src/main/frontend/src/js/components/Header.jsx b/src/main/frontend/src/js/components/Header.jsx
index d1fc22d9..1211a11c 100644
--- a/src/main/frontend/src/js/components/Header.jsx
+++ b/src/main/frontend/src/js/components/Header.jsx
@@ -110,4 +110,4 @@ const FineInfo = ({totalFine, onShowReceipt, className}) => {
)
-}
\ No newline at end of file
+}
diff --git a/src/main/frontend/src/js/components/UserProgress.jsx b/src/main/frontend/src/js/components/UserProgress.jsx
index abfa326f..941c1eb9 100644
--- a/src/main/frontend/src/js/components/UserProgress.jsx
+++ b/src/main/frontend/src/js/components/UserProgress.jsx
@@ -213,21 +213,21 @@ export function UserProgress({fromDate, toDate}) {
return (
= 60 && styles.completed}`)}>
+ className={cm(styles.tierIcon, `${DesignUtils.getTierIconClass(user.level)}`)}>
{/*
*/}
{user.nickname} {isWeekPass ?
이번주 패스 : ''}
- {user.weekPassCount > 0 && (
-
- 🛡️{user.weekPassCount}
-
- )}
+ {/*{user.weekPassCount > 0 && (*/}
+ {/* */}
+ {/* 🛡️{user.weekPassCount}*/}
+ {/* */}
+ {/*)}*/}