Fix tests

Author: sake92

.github/workflows/ci.yaml

@@ -18,4 +18,6 @@ jobs:
 
       - name: Build and test
         shell: bash
-        run: sbt test
+        run: |
+          npm install jsdom
+          sbt test

build.sbt

@@ -31,7 +31,7 @@ lazy val editor = (project in file("editor"))
     name := "flowrun-editor",
     libraryDependencies ++= Seq(
       "com.lihaoyi" %%% "scalatags" % "0.13.1",
-      "com.lihaoyi" %%% "utest" % "0.8.5" % Test
+      "com.lihaoyi" %%% "utest" % "0.9.1" % Test
     ),
     scalacOptions ++= Seq(
       "-Xmax-inlines",
@@ -57,7 +57,7 @@ lazy val interpreter = crossProject(JVMPlatform, JSPlatform)
       "io.github.cquiroz" %%% "scala-java-time" % "2.6.0",
       "com.outr" %%% "reactify" % "4.1.3",
       "ba.sake" %%% "tupson" % "0.18.0",
-      "com.lihaoyi" %%% "utest" % "0.8.5" % Test
+      "com.lihaoyi" %%% "utest" % "0.9.1" % Test
     ),
     scalacOptions ++= Seq(
       "-Xmax-inlines",

editor/src/main/scala/dev/sacode/flowrun/FlowRunEditor.scala

@@ -519,7 +519,6 @@ class FlowRunEditor(
     codeArea.render(id)
 
   private def doOnModelChange(): Unit =
-    programModel.incrRevision()
     Option(changeCallback).foreach(cb => cb(this))
 
   private def setLayout(): Unit = {

interpreter/shared/src/main/scala/dev/sacode/flowrun/ProgramModel.scala

@@ -15,15 +15,17 @@ class ProgramModel(
   var currentSelectedFunctionId: String = MainFunId
   var currentSelectedStmtId: Option[String] = None
 
-  def incrRevision(): Unit =
+  private def incrRevision(): Unit =
     ast = ast.copy(revision = ast.revision + 1)
 
   def setName(name: String): Unit =
     ast = ast.copy(name = name)
+    incrRevision()
     flowrunChannel := FlowRun.Event.FunctionUpdated
 
   def setConfig(config: FlowRunConfig): Unit =
     ast = ast.copy(config = config)
+    incrRevision()
     flowrunChannel := FlowRun.Event.ConfigChanged
 
   def currentFunction: Function =
@@ -34,6 +36,7 @@ class ProgramModel(
     val newFunctions = ast.functions.appended(fun)
     ast = ast.copy(functions = newFunctions)
     currentSelectedFunctionId = fun.id
+    incrRevision()
     flowrunChannel := FlowRun.Event.Deselected
     flowrunChannel := FlowRun.Event.FunctionUpdated
 
@@ -55,6 +58,7 @@ class ProgramModel(
     val newFunctions = ast.functions.filterNot(_.id == id)
     ast = ast.copy(functions = newFunctions)
     currentSelectedFunctionId = MainFunId
+    incrRevision()
     flowrunChannel := FlowRun.Event.Deselected
     flowrunChannel := FlowRun.Event.FunctionUpdated
 
@@ -76,6 +80,7 @@ class ProgramModel(
       else f
     }
     ast = ast.copy(functions = newFunctions)
+    incrRevision()
     flowrunChannel := FlowRun.Event.FunctionUpdated
 
   /* per-function */
@@ -102,7 +107,7 @@ class ProgramModel(
           val newFunctions = ast.functions.updated(idx, newFunction)
           ast = ast.copy(functions = newFunctions)
     }
-
+    incrRevision()
     flowrunChannel := evt
   }
 }

interpreter/shared/src/test/scala/dev/sacode/flowrun/eval/InterpreterTest.scala

@@ -46,8 +46,8 @@ object InterpreterTests extends TestSuite {
         val scope = interpreter.symTab.globalScope.childScopes.head
         assert(!scope.isDeclaredVar("nope"))
         assert(scope.isDeclaredVar("empty"))
-        intercept[EvalException](scope.getValue("", "nope"))
-        intercept[EvalException](scope.getValue("", "empty"))
+        assertThrows[EvalException](scope.getValue("", "nope"))
+        assertThrows[EvalException](scope.getValue("", "empty"))
       }
     }
 

package.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "jsdom": "^21.1.0"
+    "jsdom": "^21.1.2"
   }
 }