The endpoint takes an address and a status; there is no name field. + * * @param permalink the stream permalink * @param request the subscriber fields * @return the stored subscriber diff --git a/src/test/java/com/camelmailer/InboundLogsTest.java b/src/test/java/com/camelmailer/InboundLogsTest.java index d4de5e7..385fa84 100644 --- a/src/test/java/com/camelmailer/InboundLogsTest.java +++ b/src/test/java/com/camelmailer/InboundLogsTest.java @@ -5,6 +5,7 @@ import com.camelmailer.inbound.InboundList; import com.camelmailer.inbound.ListInboundOptions; +import com.camelmailer.inbound.RequeueResult; import com.camelmailer.logs.LogList; import com.camelmailer.logs.TagCount; import java.util.List; @@ -37,12 +38,16 @@ void inboundListReadsTheInboundKey() { @Test void inboundRetryAndBypass() { try (MockServer server = new MockServer()) { - server.enqueueData("{\"queued\":true}"); - assertTrue(server.client().inbound().retry(55).queued()); + // The endpoint answers with "requeued", and carries the message. + String body = "{\"requeued\":true,\"message\":{\"id\":55,\"status\":\"Pending\"}}"; + server.enqueueData(body); + RequeueResult retried = server.client().inbound().retry(55); + assertTrue(retried.requeued()); + assertEquals(55L, retried.message().id()); assertEquals("/api/v2/server/inbound/55/retry", server.takeRequest().path()); - server.enqueueData("{\"queued\":true}"); - assertTrue(server.client().inbound().bypass(55).queued()); + server.enqueueData(body); + assertTrue(server.client().inbound().bypass(55).requeued()); assertEquals("/api/v2/server/inbound/55/bypass", server.takeRequest().path()); } } diff --git a/src/test/java/com/camelmailer/SubscribersLayoutsTest.java b/src/test/java/com/camelmailer/SubscribersLayoutsTest.java index c62129e..b9d34e0 100644 --- a/src/test/java/com/camelmailer/SubscribersLayoutsTest.java +++ b/src/test/java/com/camelmailer/SubscribersLayoutsTest.java @@ -41,9 +41,15 @@ void subscribersAddUpsertsByAddress() { .subscribers() .add( "product-news", - SubscriberRequest.builder().address("ada@example.com").name("Ada").build()); + SubscriberRequest.builder() + .address("ada@example.com") + .status("subscribed") + .build()); - assertTrue(server.takeRequest().body().contains("\"address\":\"ada@example.com\"")); + // The endpoint takes an address and a status; there is no name field. + String body = server.takeRequest().body(); + assertTrue(body.contains("\"address\":\"ada@example.com\"")); + assertTrue(body.contains("\"status\":\"subscribed\"")); assertEquals("ada@example.com", subscriber.address()); } }