From 7f8d20002095eba6bd1b52d394a733ae26003383 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCrten?= <sebastian@mobanisto.de>
Date: Fri, 5 Nov 2021 12:42:48 +0100
Subject: [PATCH] Let / endpoint return 418 I'm a teapot
---
.../java/org/briarproject/mailbox/core/server/Routing.kt | 5 ++++-
.../mailbox/core/server/WebServerIntegrationTest.kt | 6 +++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/mailbox-core/src/main/java/org/briarproject/mailbox/core/server/Routing.kt b/mailbox-core/src/main/java/org/briarproject/mailbox/core/server/Routing.kt
index 1157de2d..15605cf8 100644
--- a/mailbox-core/src/main/java/org/briarproject/mailbox/core/server/Routing.kt
+++ b/mailbox-core/src/main/java/org/briarproject/mailbox/core/server/Routing.kt
@@ -7,6 +7,7 @@ import io.ktor.auth.authenticate
import io.ktor.features.BadRequestException
import io.ktor.features.MissingRequestParameterException
import io.ktor.http.ContentType
+import io.ktor.http.HttpStatusCode
import io.ktor.http.HttpStatusCode.Companion.BadRequest
import io.ktor.http.HttpStatusCode.Companion.Unauthorized
import io.ktor.response.respond
@@ -32,7 +33,9 @@ internal fun Application.configureBasicApi(
) = routing {
route(V) {
get {
- call.respondText("Hello world!", ContentType.Text.Plain)
+ call.respondText("Hello, I'm a Briar teapot",
+ ContentType.Text.Plain,
+ HttpStatusCode(418, "I'm a teapot"))
}
authenticate {
delete {
diff --git a/mailbox-core/src/test/java/org/briarproject/mailbox/core/server/WebServerIntegrationTest.kt b/mailbox-core/src/test/java/org/briarproject/mailbox/core/server/WebServerIntegrationTest.kt
index 95dc851d..0d363e3a 100644
--- a/mailbox-core/src/test/java/org/briarproject/mailbox/core/server/WebServerIntegrationTest.kt
+++ b/mailbox-core/src/test/java/org/briarproject/mailbox/core/server/WebServerIntegrationTest.kt
@@ -10,10 +10,10 @@ import kotlin.test.assertEquals
class WebServerIntegrationTest : IntegrationTest() {
@Test
- fun routeRespondsWithHelloWorldString(): Unit = runBlocking {
+ fun routeRespondsWithTeapot(): Unit = runBlocking {
val response: HttpResponse = httpClient.get("$baseUrl/")
- assertEquals(200, response.status.value)
- assertEquals("Hello world!", response.readText())
+ assertEquals(418, response.status.value)
+ assertEquals("Hello, I'm a Briar teapot", response.readText())
}
@Test
--
GitLab