From d4e065dc3c8b80db24a96c83ddcca10b7aedc684 Mon Sep 17 00:00:00 2001 From: adamw Date: Thu, 21 Dec 2017 09:30:51 +0100 Subject: Better not found message if no handlers match in the stub backend --- .../com/softwaremill/sttp/testing/SttpBackendStub.scala | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'core') diff --git a/core/src/main/scala/com/softwaremill/sttp/testing/SttpBackendStub.scala b/core/src/main/scala/com/softwaremill/sttp/testing/SttpBackendStub.scala index fed2acc..1d5b3c6 100644 --- a/core/src/main/scala/com/softwaremill/sttp/testing/SttpBackendStub.scala +++ b/core/src/main/scala/com/softwaremill/sttp/testing/SttpBackendStub.scala @@ -2,8 +2,8 @@ package com.softwaremill.sttp.testing import java.io.{File, InputStream} -import com.softwaremill.sttp.testing.SttpBackendStub._ import com.softwaremill.sttp._ +import com.softwaremill.sttp.testing.SttpBackendStub._ import scala.concurrent.Future import scala.language.higherKinds @@ -69,7 +69,12 @@ class SttpBackendStub[R[_], S] private ( wrapResponse(tryAdjustResponseType(request.response, response)) case Success(None) => fallback match { - case None => wrapResponse(DefaultResponse) + case None => + wrapResponse( + Response[Nothing](Left("Not Found: " + request.uri), + 404, + Nil, + Nil)) case Some(fb) => fb.send(request) } case Failure(e) => rm.error(e) @@ -153,9 +158,6 @@ object SttpBackendStub { PartialFunction.empty, Some(fallback)) - private val DefaultResponse = - Response[Nothing](Left("Not Found"), 404, Nil, Nil) - private[sttp] def tryAdjustResponseType[T, U](ra: ResponseAs[T, _], r: Response[U]): Response[_] = { r.body match { -- cgit v1.2.3