Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-09-24 13:05:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2173 from Athou/renovate/org.mock-server-mockserver-junit-jupiter-7.x

Browse Source 
chore(deps): update dependency org.mock-server:mockserver-junit-jupiter to v7
This commit is contained in:
Jérémie Panzer
2026-06-07 08:44:16 +02:00
committed by GitHub
parent 48dca41738 f7fcb659f7
commit 33445c93e8
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
commafeed-server/pom.xml
View File

@@ -477,7 +477,7 @@
<dependency> <dependency>
<groupId>org.mock-server</groupId> <groupId>org.mock-server</groupId>
<artifactId>mockserver-junit-jupiter</artifactId> <artifactId>mockserver-junit-jupiter</artifactId>
<version>6.1.0</version> <version>7.0.0</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

5
commafeed-server/src/test/java/com/commafeed/integration/BaseIT.java
View File

@@ -30,8 +30,10 @@ import com.commafeed.frontend.model.request.InitialSetupRequest;
import com.commafeed.frontend.model.request.SubscribeRequest; import com.commafeed.frontend.model.request.SubscribeRequest;
import io.restassured.RestAssured; import io.restassured.RestAssured;
import io.restassured.config.ObjectMapperConfig;
import io.restassured.http.ContentType; import io.restassured.http.ContentType;
import io.restassured.http.Header; import io.restassured.http.Header;
import io.restassured.mapper.ObjectMapperType;
import lombok.Getter; import lombok.Getter;
@Getter @Getter
@@ -59,6 +61,9 @@ public abstract class BaseIT {
URL resource = Objects.requireNonNull(getClass().getResource("/feed/rss.xml")); URL resource = Objects.requireNonNull(getClass().getResource("/feed/rss.xml"));
this.mockServerClient.when(FEED_REQUEST) this.mockServerClient.when(FEED_REQUEST)
.respond(HttpResponse.response().withBody(IOUtils.toString(resource, StandardCharsets.UTF_8))); .respond(HttpResponse.response().withBody(IOUtils.toString(resource, StandardCharsets.UTF_8)));
// remove when Quarkus supports Jackson 3
RestAssured.config = RestAssured.config().objectMapperConfig(new ObjectMapperConfig(ObjectMapperType.JACKSON_2));
} }
@AfterEach @AfterEach