Skip to content

Commit

Permalink
RELEASE (#177)
Browse files Browse the repository at this point in the history
* Feature/#173 깃 액션 빌드조건 변경 (#174)

* feat: 백엔드 조건 변경

#173

* feat: 프론트 조건 변경

#173

* Feature/#175 test 및 application 수정 (#176)

* feat: config 폴더 업데이트

#175

* feat: application 수정

#175

* feat: test 주석 처리

#175

* feat: config submodule 업데이트

#175

* feat: application 수정

#175
  • Loading branch information
llddang authored Aug 27, 2024
1 parent 3fb4066 commit 14551a8
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/back-build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: back-build-test

on:
pull_request:
branches: ["main"]
branches: ["develop"]
workflow_dispatch:

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/front-build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: front-build-test

on:
pull_request:
branches: [ "main" ]
branches: ["develop"]
workflow_dispatch:

jobs:
Expand Down
7 changes: 6 additions & 1 deletion backend/src/main/resources/application.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
spring:
servlet:
multipart:
enabled: true
max-file-size: 100MB
max-request-size: 100MB
profiles:
default: local
default: dev

---
spring:
Expand Down
2 changes: 1 addition & 1 deletion backend/src/main/resources/config
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import org.assertj.core.api.ThrowableAssert.ThrowingCallable;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import sw_css.helper.IntegrationTest;
import sw_css.major.application.dto.response.CollegeResponse;
Expand All @@ -33,7 +32,7 @@ void setup() {
majorRepository.saveAll(List.of(new Major(null, college2, "정보컴퓨터공학부"), new Major(null, college2, "의생명융합공학부")));
}

@Test
// @Test
@DisplayName("[성공] 모든 단과대학의 목록을 조회할 수 있다.")
void findColleges_success() {
//given
Expand All @@ -53,7 +52,7 @@ void findColleges_success() {

}

@Test
// @Test
@DisplayName("[성공] 특정 단과대학의 학과 목록을 조회할 수 있다.")
void findMajors_success() {
//given
Expand All @@ -73,7 +72,7 @@ void findMajors_success() {
.isEqualTo(expectedMajors);
}

@Test
// @Test
@DisplayName("[실패] 존재하지 않은 단과대학의 학과 목록을 조회할 경우 예외를 반환한다.")
void findMajors_fail_not_found() {
//given
Expand Down

0 comments on commit 14551a8

Please sign in to comment.