From 9d881a840f730102699f785017e9f5d3b355c52f Mon Sep 17 00:00:00 2001 From: Art Date: Mon, 20 Sep 2021 18:45:10 +0300 Subject: [PATCH] refactored backend tests to generate profileImageUrl in BaseTest with origin http://localhost:8080 and without default filename (#21) --- .../fullstack/supportportal/backend/common/BaseUserTest.java | 3 +-- .../supportportal/backend/controller/UserResourceTest.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/support-portal-backend/src/test/java/net/shyshkin/study/fullstack/supportportal/backend/common/BaseUserTest.java b/support-portal-backend/src/test/java/net/shyshkin/study/fullstack/supportportal/backend/common/BaseUserTest.java index 0957de9..63a8c8f 100644 --- a/support-portal-backend/src/test/java/net/shyshkin/study/fullstack/supportportal/backend/common/BaseUserTest.java +++ b/support-portal-backend/src/test/java/net/shyshkin/study/fullstack/supportportal/backend/common/BaseUserTest.java @@ -13,7 +13,6 @@ import java.time.LocalDateTime; import java.util.UUID; import static net.shyshkin.study.fullstack.supportportal.backend.constant.FileConstant.DEFAULT_USER_IMAGE_PATH; -import static net.shyshkin.study.fullstack.supportportal.backend.constant.FileConstant.USER_IMAGE_FILENAME; import static net.shyshkin.study.fullstack.supportportal.backend.domain.Role.ROLE_ADMIN; @SpringBootTest @@ -64,7 +63,7 @@ public abstract class BaseUserTest { .fromUriString("http://localhost:8080") .path(DEFAULT_USER_IMAGE_PATH) .pathSegment(userId) - .pathSegment(USER_IMAGE_FILENAME) +// .pathSegment(USER_IMAGE_FILENAME) .toUriString(); } } \ No newline at end of file diff --git a/support-portal-backend/src/test/java/net/shyshkin/study/fullstack/supportportal/backend/controller/UserResourceTest.java b/support-portal-backend/src/test/java/net/shyshkin/study/fullstack/supportportal/backend/controller/UserResourceTest.java index a076464..c391cc5 100644 --- a/support-portal-backend/src/test/java/net/shyshkin/study/fullstack/supportportal/backend/controller/UserResourceTest.java +++ b/support-portal-backend/src/test/java/net/shyshkin/study/fullstack/supportportal/backend/controller/UserResourceTest.java @@ -216,7 +216,7 @@ class UserResourceTest extends BaseUserTest { .hasFieldOrPropertyWithValue("isActive", true) .hasFieldOrPropertyWithValue("isNotLocked", true) .hasFieldOrPropertyWithValue("role", "ROLE_ADMIN") - .satisfies(u -> assertThat(u.getProfileImageUrl()).endsWith(String.format("/user/image/profile/%s/avatar.jpg", u.getUserId()))); + .satisfies(u -> assertThat(u.getProfileImageUrl()).endsWith(String.format("/user/image/profile/%s", u.getUserId()))); String token = responseEntity.getHeaders().getFirst(JWT_TOKEN_HEADER); log.debug("Token: {}", token);