From d97d5e9a29520cddf0931bb56356f268be1cf1a3 Mon Sep 17 00:00:00 2001
From: Daniel Slapman <danslapman@gmail.com>
Date: Sun, 5 Jan 2025 18:40:09 +0100
Subject: [PATCH] Re-enable edsl & examples

---
 backend/build.sbt                                        | 9 +++++----
 .../edsl/interpreter/AsyncScalaTestSuite.scala           | 4 ++--
 .../mockingbird/edsl/interpreter/MarkdownGenerator.scala | 4 ++--
 .../edsl/interpreter/MarkdownGeneratorSuite.scala        | 2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/backend/build.sbt b/backend/build.sbt
index 005790c1..3b86133c 100644
--- a/backend/build.sbt
+++ b/backend/build.sbt
@@ -153,7 +153,6 @@ lazy val `mockingbird-native` = (project in file("mockingbird-native"))
     )
   )
 
-/*
 val edsl = (project in file("edsl"))
   .dependsOn(utils, circeUtils)
   .settings(Settings.common)
@@ -169,7 +168,9 @@ val edsl = (project in file("edsl"))
     ).flatten,
     libraryDependencies ++= Seq(
       "com.softwaremill.sttp.client4" %% "circe"               % Versions.sttp,
-      "pl.muninn"                     %% "scala-md-tag"        % "0.2.3",
+      "pl.muninn"                     %% "scala-md-tag"        % "0.2.3" cross CrossVersion.for3Use2_13 excludeAll(
+        ExclusionRule("org.scala-lang.modules", "scala-collection-compat_2.13")
+      ),
     ),
   )
   .settings(
@@ -202,7 +203,7 @@ val examples = (project in file("examples"))
       "lintAll",
       "scalafixAll; scalafmtAll"
     )
-  )*/
+  )
 
 val root = (project in file("."))
   .disablePlugins(ContribWarts)
@@ -213,7 +214,7 @@ val root = (project in file("."))
     mockingbird,
     `mockingbird-api`,
     `mockingbird-native`,
-//    `edsl`
+    `edsl`
   )
   .settings(
     run / aggregate := false,
diff --git a/backend/edsl/src/main/scala/ru/tinkoff/tcb/mockingbird/edsl/interpreter/AsyncScalaTestSuite.scala b/backend/edsl/src/main/scala/ru/tinkoff/tcb/mockingbird/edsl/interpreter/AsyncScalaTestSuite.scala
index c46397d1..78fadc48 100644
--- a/backend/edsl/src/main/scala/ru/tinkoff/tcb/mockingbird/edsl/interpreter/AsyncScalaTestSuite.scala
+++ b/backend/edsl/src/main/scala/ru/tinkoff/tcb/mockingbird/edsl/interpreter/AsyncScalaTestSuite.scala
@@ -48,7 +48,7 @@ trait AsyncScalaTestSuite extends AsyncFunSuiteLike {
    */
   protected def generateTests(es: ExampleSet[HttpResponseR]): Unit =
     es.examples.foreach { desc =>
-      test(desc.name)(desc.steps.foldMap(stepsBuilder).as(succeed))(desc.pos)
+      test(desc.name)(desc.steps.foldMap(stepsBuilder).as(succeed))
     }
 
   private[interpreter] def stepsBuilder: FunctionK[Step, Future] = new (Step ~> Future) {
@@ -94,7 +94,7 @@ trait AsyncScalaTestSuite extends AsyncFunSuiteLike {
                   |Value:
                   |${value}
                   |${clue.mkString("\n")}
-                  |""".stripMargin)(pos)
+                  |""".stripMargin)
       case Valid(_) => succeed
     }
 
diff --git a/backend/edsl/src/main/scala/ru/tinkoff/tcb/mockingbird/edsl/interpreter/MarkdownGenerator.scala b/backend/edsl/src/main/scala/ru/tinkoff/tcb/mockingbird/edsl/interpreter/MarkdownGenerator.scala
index 4b3f49d8..cc9fdb8f 100644
--- a/backend/edsl/src/main/scala/ru/tinkoff/tcb/mockingbird/edsl/interpreter/MarkdownGenerator.scala
+++ b/backend/edsl/src/main/scala/ru/tinkoff/tcb/mockingbird/edsl/interpreter/MarkdownGenerator.scala
@@ -124,12 +124,12 @@ final class MarkdownGenerator(baseUri: Uri) {
 
         case CheckHttp(_, HttpResponseExpected(code, body, headers), _) =>
           val bodyStr = body.map(_.show)
-          val cb = Vector(
+          val cb = Vector[Option[String]](
             code.map(c => s"Response code: ${c.matcher.show}\n"),
             headers.nonEmpty.option {
               headers.map { case (k, v) => s"$k: '${v.matcher.show}'" }.mkString("Response headers:\n", "\n", "\n")
             },
-            bodyStr.map("Response body:\n" ++ _ ++ "\n"),
+            bodyStr.map(bs => "Response body:\n".concat(bs).concat("\n")),
           ).flatten.mkString("\n")
 
           Writer(
diff --git a/backend/edsl/src/test/scala/ru/tinkoff/tcb/mockingbird/edsl/interpreter/MarkdownGeneratorSuite.scala b/backend/edsl/src/test/scala/ru/tinkoff/tcb/mockingbird/edsl/interpreter/MarkdownGeneratorSuite.scala
index e53d3e00..af973d23 100644
--- a/backend/edsl/src/test/scala/ru/tinkoff/tcb/mockingbird/edsl/interpreter/MarkdownGeneratorSuite.scala
+++ b/backend/edsl/src/test/scala/ru/tinkoff/tcb/mockingbird/edsl/interpreter/MarkdownGeneratorSuite.scala
@@ -36,7 +36,7 @@ class MarkdownGeneratorSuite extends AnyFunSuite with Matchers {
 
     val mds = eset.describe(text).foldMap(mdg.stepsPrinterW).written
     mds should have length 1
-    mds.head.md shouldBe ("\n" ++ text ++ "\n")
+    mds.head.md shouldBe ("\n".concat(text).concat("\n"))
   }
 
   test("sendHttp produces curl command") {