Merge branch 'main' into netty-internal-logging-support

zio · Dec 23, 2024 · e080d81 · e080d81
2 parents 145118f + 57378d3
commit e080d81
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/zio-http/jvm/src/test/scala/zio/http/endpoint/AuthSpec.scala b/zio-http/jvm/src/test/scala/zio/http/endpoint/AuthSpec.scala
@@ -211,7 +211,7 @@ object AuthSpec extends ZIOSpecDefault {
               .catchAllCause(c => ZIO.logInfoCause(c)) <* ZIO.sleep(1.seconds)
             response <- response
           } yield assertTrue(response == "admin")
-        },
+        } @@ TestAspect.flaky,
         test("Auth with context and endpoint client with path parameter") {
           val endpoint =
             Endpoint(Method.GET / int("a")).out[String](MediaType.text.`plain`).auth(AuthType.Basic)

diff --git a/zio-http/jvm/src/test/scala/zio/http/security/UserDataSpec.scala b/zio-http/jvm/src/test/scala/zio/http/security/UserDataSpec.scala
@@ -23,7 +23,7 @@ object UserDataSpec extends ZIOSpecDefault {
   val tuples = Gen.fromIterable(
     List(
       (MediaType.text.`html`, "<script>alert('XSS');</script>", "&lt;script&gt;alert(&#x27;XSS&#x27;);&lt;/script&gt;"),
-      (MediaType.text.`html`, "&", "&amp"),
+      (MediaType.text.`html`, "&", "&amp;"),
       (MediaType.text.`html`, "<", "&lt;"),
       (MediaType.text.`html`, ">", "&gt;"),
       (MediaType.text.`html`, "\"", "&quot;"),