Start of test tidy

Quafadas · May 25, 2024 · e914870 · e914870
1 parent c0d0582
commit e914870
Show file tree

Hide file tree

Showing 4 changed files with 191 additions and 181 deletions.
diff --git a/project/src/build.runner.scala b/project/src/build.runner.scala
@@ -77,7 +77,7 @@ def buildRunnerScli(
                 .chunks
                 .evalMap(
                   aChunk =>
-                    if aChunk.toString.contains("node ./") then
+                    if aChunk.toString.contains("main.js, run it with") then
                       logger.trace("Detected that linking was successful, emitting refresh event") >>
                         refreshTopic.publish1("refresh")
                     else

diff --git a/project/src/routes.scala b/project/src/routes.scala
@@ -56,27 +56,27 @@ object ETagMiddleware:
       req.headers.get(ci"If-None-Match") match
         case Some(header) =>
           val etag = header.head.value
-          OptionT.liftF(logger.debug(req.uri.toString)) >>
-            OptionT.liftF(logger.debug(etag)) >>
-            service(req).semiflatMap {
-              resp =>
-                mr.get
-                  .flatMap {
-                    map =>
-                      map.get(req.uri.path.toString.drop(1)) match
-                        case Some(foundEt) =>
-                          if etag == foundEt then
-                            logger.debug("ETag matches, returning 304") >>
-                              IO(Response[IO](Status.NotModified))
-                          else
-                            logger.debug(etag) >>
-                              logger.debug("ETag doesn't match, returning 200") >>
-                              respondWithEtag(resp)
-                          end if
-                        case None =>
-                          respondWithEtag(resp)
-                  }
-            }
+          // OptionT.liftF(logger.debug(req.uri.toString)) >>
+          //   OptionT.liftF(logger.debug(etag)) >>
+          service(req).semiflatMap {
+            resp =>
+              mr.get
+                .flatMap {
+                  map =>
+                    map.get(req.uri.path.toString.drop(1)) match
+                      case Some(foundEt) =>
+                        if etag == foundEt then
+                          logger.debug("ETag matches, returning 304") >>
+                            IO(Response[IO](Status.NotModified))
+                        else
+                          logger.debug(etag) >>
+                            logger.debug("ETag doesn't match, returning 200") >>
+                            respondWithEtag(resp)
+                        end if
+                      case None =>
+                        respondWithEtag(resp)
+                }
+          }
         case _ =>
           OptionT.liftF(logger.debug("No headers in query, service it")) >>
             service(req).semiflatMap {

diff --git a/project/test/src/UtilityFcts.scala b/project/test/src/UtilityFcts.scala
@@ -32,7 +32,6 @@ class UtilityFcs extends munit.FunSuite:
 
   test(" That we can inject a refresh script") {
     val html = injectRefreshScript("<html><head></head><body></body></html>")
-    println(html)
     assert(
       html.contains("sse.addEventListener")
     )