Merge pull request #1264 from gemini-hlsw/update/utest-0.9.1

hugo-vrijswijk · web-flow · commit 8e089a3e8050 · 2025-10-16T12:33:47.000+02:00
Update utest to 0.9.1
diff --git a/build.sbt b/build.sbt
@@ -33,7 +33,7 @@ val munitScalacheckV = "1.2.0"
 val munitV           = "1.2.1"
 val scalaJsDomV      = "2.8.1"
 val scalaJsReactV    = "3.0.0-beta10"
-val utestV           = "0.8.9"
+val utestV           = "0.9.1"
 
 ThisBuild / crossScalaVersions := Seq("3.7.3")
 
diff --git a/draggable/src/test/scala/react/draggable/DraggableTests.scala b/draggable/src/test/scala/react/draggable/DraggableTests.scala
@@ -5,15 +5,15 @@ package lucuma.react
 
 package draggable
 
-import japgolly.scalajs.react.*
+import japgolly.scalajs.react.Callback
 import japgolly.scalajs.react.test.*
 import japgolly.scalajs.react.vdom.html_<^.*
 import org.scalajs.dom.MouseEvent
 import utest.*
 
-object DraggableTests extends TestSuite {
+class DraggableTests extends TestSuite {
   val tests = Tests {
-    "render" - {
+    test("render") {
       val draggable = Draggable(Draggable.props(), <.div("Abc"))
       ReactTestUtils2.withRendered(draggable) { m =>
         val html =
@@ -22,7 +22,7 @@ object DraggableTests extends TestSuite {
         assert(m.outerHTML() == html)
       }
     }
-    "supportAllowAnyClick" - {
+    test("supportAllowAnyClick") {
       Draggable(Draggable.props(), <.div("Abc")).props.allowAnyClick.toOption ==> Some(false)
       val draggable =
         Draggable(Draggable.props(allowAnyClick = true), <.div("Abc"))
@@ -34,7 +34,7 @@ object DraggableTests extends TestSuite {
       }
       draggable.props.allowAnyClick.toOption ==> Some(true)
     }
-    "supportAxis" - {
+    test("supportAxis") {
       Draggable(Draggable.props(), <.div("Abc")).props.axis.toOption ==> Some("both")
       val draggable = Draggable(Draggable.props(axis = Axis.X), <.div("Abc"))
       ReactTestUtils2.withRendered(draggable) { m =>
@@ -45,10 +45,10 @@ object DraggableTests extends TestSuite {
       }
       draggable.props.axis.toOption ==> Some("x")
     }
-    "boundsDefault" - {
+    test("boundsDefault") {
       Draggable(Draggable.props(), <.div("Abc")).props.bounds.toOption ==> Some(false)
     }
-    "supportBounds1" - {
+    test("supportBounds1") {
       val draggable =
         Draggable(Draggable.props(bounds = FalseBounds), <.div("Abc"))
       ReactTestUtils2.withRendered(draggable) { m =>
@@ -59,7 +59,7 @@ object DraggableTests extends TestSuite {
       }
       draggable.props.bounds.toOption ==> Some(false)
     }
-    "supportBounds2" - {
+    test("supportBounds2") {
       val draggable =
         Draggable(Draggable.props(bounds = "bounds"), <.div("Abc"))
       ReactTestUtils2.withRendered(draggable) { m =>
@@ -70,7 +70,7 @@ object DraggableTests extends TestSuite {
       }
       draggable.props.bounds.toOption ==> Some("bounds")
     }
-    "supportBounds3" - {
+    test("supportBounds3") {
       val draggable =
         Draggable(Draggable.props(bounds = DraggableBounds(1, 2, 3, 4)), <.div("Abc"))
       ReactTestUtils2.withRendered(draggable) { m =>
@@ -82,7 +82,7 @@ object DraggableTests extends TestSuite {
       draggable.props.bounds.toOption
         .map(_.asInstanceOf[DraggableBounds].left) ==> Some(1)
     }
-    "supportCancel" - {
+    test("supportCancel") {
       Draggable(Draggable.props(), <.div("Abc")).props.cancel.toOption ==> None
       val draggable =
         Draggable(Draggable.props(cancel = "cancel"), <.div("Abc"))
@@ -94,7 +94,7 @@ object DraggableTests extends TestSuite {
       }
       draggable.props.cancel.toOption ==> Some("cancel")
     }
-    "supportDefaultClassName" - {
+    test("supportDefaultClassName") {
       Draggable(Draggable.props(), <.div("Abc")).props.defaultClassName.toOption ==> Some(
         "react-draggable"
       )
@@ -108,7 +108,7 @@ object DraggableTests extends TestSuite {
       }
       draggable.props.defaultClassName.toOption ==> Some("draggable")
     }
-    "supportDefaultClassNameDragging" - {
+    test("supportDefaultClassNameDragging") {
       Draggable(Draggable.props(), <.div("Abc")).props.defaultClassNameDragging.toOption ==> Some(
         "react-draggable-dragging"
       )
@@ -122,7 +122,7 @@ object DraggableTests extends TestSuite {
       }
       draggable.props.defaultClassNameDragging.toOption ==> Some("draggable")
     }
-    "supportDefaultClassNameDragged" - {
+    test("supportDefaultClassNameDragged") {
       Draggable(Draggable.props(), <.div("Abc")).props.defaultClassNameDragged.toOption ==> Some(
         "react-draggable-dragged"
       )
@@ -136,7 +136,7 @@ object DraggableTests extends TestSuite {
       }
       draggable.props.defaultClassNameDragged.toOption ==> Some("draggable")
     }
-    "supportDefaultPosition" - {
+    test("supportDefaultPosition") {
       Draggable(Draggable.props(), <.div("Abc")).props.defaultPosition.toOption
         .map(_.x) ==> Some(0)
       Draggable(Draggable.props(), <.div("Abc")).props.defaultPosition.toOption
@@ -152,7 +152,7 @@ object DraggableTests extends TestSuite {
       draggable.props.defaultPosition.toOption.map(_.x) ==> Some(1)
       draggable.props.defaultPosition.toOption.map(_.y) ==> Some(2)
     }
-    "supportDisabled" - {
+    test("supportDisabled") {
       Draggable(Draggable.props(), <.div("Abc")).props.disabled.toOption ==> Some(false)
       val draggable = Draggable(Draggable.props(disabled = true), <.div("Abc"))
       ReactTestUtils2.withRendered(draggable) { m =>
@@ -163,7 +163,7 @@ object DraggableTests extends TestSuite {
       }
       draggable.props.disabled.toOption ==> Some(true)
     }
-    "supportGrid" - {
+    test("supportGrid") {
       Draggable(Draggable.props(), <.div("Abc")).props.grid.toOption ==> None
       val draggable =
         Draggable(Draggable.props(grid = Grid(1, 2)), <.div("Abc"))
@@ -176,7 +176,7 @@ object DraggableTests extends TestSuite {
       draggable.props.grid.toOption.map(_.apply(0)) ==> Some(1)
       draggable.props.grid.toOption.map(_.apply(1)) ==> Some(2)
     }
-    "supportHandle" - {
+    test("supportHandle") {
       Draggable(Draggable.props(), <.div("Abc")).props.handle.toOption ==> None
       val draggable =
         Draggable(Draggable.props(handle = "handle"), <.div("Abc"))
@@ -188,24 +188,24 @@ object DraggableTests extends TestSuite {
       }
       draggable.props.handle.toOption ==> Some("handle")
     }
-    "supportOffsetParent" - {
+    test("supportOffsetParent") {
       Draggable(Draggable.props(), <.div("Abc")).props.offsetParent.toOption ==> None
     }
-    "supportOnMouseDown" -
+    test("supportOnMouseDown"):
       Draggable(Draggable.props(onMouseDown = (_: MouseEvent) => Callback.empty), <.div("Abc"))
-    "supportOnStart" -
+    test("supportOnStart"):
       Draggable(Draggable.props(onStart = (_: MouseEvent, _: DraggableData) => Callback.empty),
                 <.div("Abc")
       )
-    "supportOnDrag" -
+    test("supportOnDrag"):
       Draggable(Draggable.props(onDrag = (_: MouseEvent, _: DraggableData) => Callback.empty),
                 <.div("Abc")
       )
-    "supportOnStop" -
+    test("supportOnStop"):
       Draggable(Draggable.props(onStop = (_: MouseEvent, _: DraggableData) => Callback.empty),
                 <.div("Abc")
       )
-    "supportPosition" - {
+    test("supportPosition") {
       Draggable(Draggable.props(), <.div("Abc")).props.position.toOption ==> None
       val draggable =
         Draggable(Draggable.props(position = ControlPosition(1, 2)), <.div("Abc"))
@@ -218,7 +218,7 @@ object DraggableTests extends TestSuite {
       draggable.props.position.toOption.map(_.x) ==> Some(1)
       draggable.props.position.toOption.map(_.y) ==> Some(2)
     }
-    "supportPositionOffset" - {
+    test("supportPositionOffset") {
       Draggable(Draggable.props(), <.div("Abc")).props.positionOffset.toOption ==> None
       val draggable =
         Draggable(Draggable.props(positionOffset = PositionOffsetControlPosition("10%", "20%")),
diff --git a/grid-layout/src/test/scala/react/gridlayout/PackageTests.scala b/grid-layout/src/test/scala/react/gridlayout/PackageTests.scala
@@ -9,7 +9,7 @@ import utest.*
 
 import scala.language.implicitConversions
 
-object PackageTests extends TestSuite {
+class PackageTests extends TestSuite {
 
   val tests = Tests {
     test("layouItem") {
diff --git a/highcharts/src/test/scala/react/highcharts/ChartTest.scala b/highcharts/src/test/scala/react/highcharts/ChartTest.scala
@@ -7,7 +7,7 @@ import japgolly.scalajs.react.Reusable
 import japgolly.scalajs.react.test.*
 import utest.*
 
-object ChartTest extends TestSuite {
+class ChartTest extends TestSuite {
   val tests = Tests {
     test("render") {
       val chart = Chart(Reusable.always(Highcharts.defaultOptions))

Original file line number	Diff line number	Diff line change
`@@ -5,15 +5,15 @@ package lucuma.react`
`5`	`5`
`6`	`6`	`package draggable`
`7`	`7`
`8`		`-import japgolly.scalajs.react.*`
	`8`	`+import japgolly.scalajs.react.Callback`
`9`	`9`	`import japgolly.scalajs.react.test.*`
`10`	`10`	`import japgolly.scalajs.react.vdom.html_<^.*`
`11`	`11`	`import org.scalajs.dom.MouseEvent`
`12`	`12`	`import utest.*`
`13`	`13`
`14`		`-object DraggableTests extends TestSuite {`
	`14`	`+class DraggableTests extends TestSuite {`
`15`	`15`	`val tests = Tests {`
`16`		`- "render" - {`
	`16`	`+ test("render") {`
`17`	`17`	`val draggable = Draggable(Draggable.props(), <.div("Abc"))`
`18`	`18`	`ReactTestUtils2.withRendered(draggable) { m =>`
`19`	`19`	`val html =`
`@@ -22,7 +22,7 @@ object DraggableTests extends TestSuite {`
`22`	`22`	`assert(m.outerHTML() == html)`
`23`	`23`	`}`
`24`	`24`	`}`
`25`		`- "supportAllowAnyClick" - {`
	`25`	`+ test("supportAllowAnyClick") {`
`26`	`26`	`Draggable(Draggable.props(), <.div("Abc")).props.allowAnyClick.toOption ==> Some(false)`
`27`	`27`	`val draggable =`
`28`	`28`	`Draggable(Draggable.props(allowAnyClick = true), <.div("Abc"))`
`@@ -34,7 +34,7 @@ object DraggableTests extends TestSuite {`
`34`	`34`	`}`
`35`	`35`	`draggable.props.allowAnyClick.toOption ==> Some(true)`
`36`	`36`	`}`
`37`		`- "supportAxis" - {`
	`37`	`+ test("supportAxis") {`
`38`	`38`	`Draggable(Draggable.props(), <.div("Abc")).props.axis.toOption ==> Some("both")`
`39`	`39`	`val draggable = Draggable(Draggable.props(axis = Axis.X), <.div("Abc"))`
`40`	`40`	`ReactTestUtils2.withRendered(draggable) { m =>`
`@@ -45,10 +45,10 @@ object DraggableTests extends TestSuite {`
`45`	`45`	`}`
`46`	`46`	`draggable.props.axis.toOption ==> Some("x")`
`47`	`47`	`}`
`48`		`- "boundsDefault" - {`
	`48`	`+ test("boundsDefault") {`
`49`	`49`	`Draggable(Draggable.props(), <.div("Abc")).props.bounds.toOption ==> Some(false)`
`50`	`50`	`}`
`51`		`- "supportBounds1" - {`
	`51`	`+ test("supportBounds1") {`
`52`	`52`	`val draggable =`
`53`	`53`	`Draggable(Draggable.props(bounds = FalseBounds), <.div("Abc"))`
`54`	`54`	`ReactTestUtils2.withRendered(draggable) { m =>`
`@@ -59,7 +59,7 @@ object DraggableTests extends TestSuite {`
`59`	`59`	`}`
`60`	`60`	`draggable.props.bounds.toOption ==> Some(false)`
`61`	`61`	`}`
`62`		`- "supportBounds2" - {`
	`62`	`+ test("supportBounds2") {`
`63`	`63`	`val draggable =`
`64`	`64`	`Draggable(Draggable.props(bounds = "bounds"), <.div("Abc"))`
`65`	`65`	`ReactTestUtils2.withRendered(draggable) { m =>`
`@@ -70,7 +70,7 @@ object DraggableTests extends TestSuite {`
`70`	`70`	`}`
`71`	`71`	`draggable.props.bounds.toOption ==> Some("bounds")`
`72`	`72`	`}`
`73`		`- "supportBounds3" - {`
	`73`	`+ test("supportBounds3") {`
`74`	`74`	`val draggable =`
`75`	`75`	`Draggable(Draggable.props(bounds = DraggableBounds(1, 2, 3, 4)), <.div("Abc"))`
`76`	`76`	`ReactTestUtils2.withRendered(draggable) { m =>`
`@@ -82,7 +82,7 @@ object DraggableTests extends TestSuite {`
`82`	`82`	`draggable.props.bounds.toOption`
`83`	`83`	`.map(_.asInstanceOf[DraggableBounds].left) ==> Some(1)`
`84`	`84`	`}`
`85`		`- "supportCancel" - {`
	`85`	`+ test("supportCancel") {`
`86`	`86`	`Draggable(Draggable.props(), <.div("Abc")).props.cancel.toOption ==> None`
`87`	`87`	`val draggable =`
`88`	`88`	`Draggable(Draggable.props(cancel = "cancel"), <.div("Abc"))`
`@@ -94,7 +94,7 @@ object DraggableTests extends TestSuite {`
`94`	`94`	`}`
`95`	`95`	`draggable.props.cancel.toOption ==> Some("cancel")`
`96`	`96`	`}`
`97`		`- "supportDefaultClassName" - {`
	`97`	`+ test("supportDefaultClassName") {`
`98`	`98`	`Draggable(Draggable.props(), <.div("Abc")).props.defaultClassName.toOption ==> Some(`
`99`	`99`	`"react-draggable"`
`100`	`100`	`)`
`@@ -108,7 +108,7 @@ object DraggableTests extends TestSuite {`
`108`	`108`	`}`
`109`	`109`	`draggable.props.defaultClassName.toOption ==> Some("draggable")`
`110`	`110`	`}`
`111`		`- "supportDefaultClassNameDragging" - {`
	`111`	`+ test("supportDefaultClassNameDragging") {`
`112`	`112`	`Draggable(Draggable.props(), <.div("Abc")).props.defaultClassNameDragging.toOption ==> Some(`
`113`	`113`	`"react-draggable-dragging"`
`114`	`114`	`)`
`@@ -122,7 +122,7 @@ object DraggableTests extends TestSuite {`
`122`	`122`	`}`
`123`	`123`	`draggable.props.defaultClassNameDragging.toOption ==> Some("draggable")`
`124`	`124`	`}`
`125`		`- "supportDefaultClassNameDragged" - {`
	`125`	`+ test("supportDefaultClassNameDragged") {`
`126`	`126`	`Draggable(Draggable.props(), <.div("Abc")).props.defaultClassNameDragged.toOption ==> Some(`
`127`	`127`	`"react-draggable-dragged"`
`128`	`128`	`)`
`@@ -136,7 +136,7 @@ object DraggableTests extends TestSuite {`
`136`	`136`	`}`
`137`	`137`	`draggable.props.defaultClassNameDragged.toOption ==> Some("draggable")`
`138`	`138`	`}`
`139`		`- "supportDefaultPosition" - {`
	`139`	`+ test("supportDefaultPosition") {`
`140`	`140`	`Draggable(Draggable.props(), <.div("Abc")).props.defaultPosition.toOption`
`141`	`141`	`.map(_.x) ==> Some(0)`
`142`	`142`	`Draggable(Draggable.props(), <.div("Abc")).props.defaultPosition.toOption`
`@@ -152,7 +152,7 @@ object DraggableTests extends TestSuite {`
`152`	`152`	`draggable.props.defaultPosition.toOption.map(_.x) ==> Some(1)`
`153`	`153`	`draggable.props.defaultPosition.toOption.map(_.y) ==> Some(2)`
`154`	`154`	`}`
`155`		`- "supportDisabled" - {`
	`155`	`+ test("supportDisabled") {`
`156`	`156`	`Draggable(Draggable.props(), <.div("Abc")).props.disabled.toOption ==> Some(false)`
`157`	`157`	`val draggable = Draggable(Draggable.props(disabled = true), <.div("Abc"))`
`158`	`158`	`ReactTestUtils2.withRendered(draggable) { m =>`
`@@ -163,7 +163,7 @@ object DraggableTests extends TestSuite {`
`163`	`163`	`}`
`164`	`164`	`draggable.props.disabled.toOption ==> Some(true)`
`165`	`165`	`}`
`166`		`- "supportGrid" - {`
	`166`	`+ test("supportGrid") {`
`167`	`167`	`Draggable(Draggable.props(), <.div("Abc")).props.grid.toOption ==> None`
`168`	`168`	`val draggable =`
`169`	`169`	`Draggable(Draggable.props(grid = Grid(1, 2)), <.div("Abc"))`
`@@ -176,7 +176,7 @@ object DraggableTests extends TestSuite {`
`176`	`176`	`draggable.props.grid.toOption.map(_.apply(0)) ==> Some(1)`
`177`	`177`	`draggable.props.grid.toOption.map(_.apply(1)) ==> Some(2)`
`178`	`178`	`}`
`179`		`- "supportHandle" - {`
	`179`	`+ test("supportHandle") {`
`180`	`180`	`Draggable(Draggable.props(), <.div("Abc")).props.handle.toOption ==> None`
`181`	`181`	`val draggable =`
`182`	`182`	`Draggable(Draggable.props(handle = "handle"), <.div("Abc"))`
`@@ -188,24 +188,24 @@ object DraggableTests extends TestSuite {`
`188`	`188`	`}`
`189`	`189`	`draggable.props.handle.toOption ==> Some("handle")`
`190`	`190`	`}`
`191`		`- "supportOffsetParent" - {`
	`191`	`+ test("supportOffsetParent") {`
`192`	`192`	`Draggable(Draggable.props(), <.div("Abc")).props.offsetParent.toOption ==> None`
`193`	`193`	`}`
`194`		`- "supportOnMouseDown" -`
	`194`	`+ test("supportOnMouseDown"):`
`195`	`195`	`Draggable(Draggable.props(onMouseDown = (_: MouseEvent) => Callback.empty), <.div("Abc"))`
`196`		`- "supportOnStart" -`
	`196`	`+ test("supportOnStart"):`
`197`	`197`	`Draggable(Draggable.props(onStart = (_: MouseEvent, _: DraggableData) => Callback.empty),`
`198`	`198`	`<.div("Abc")`
`199`	`199`	`)`
`200`		`- "supportOnDrag" -`
	`200`	`+ test("supportOnDrag"):`
`201`	`201`	`Draggable(Draggable.props(onDrag = (_: MouseEvent, _: DraggableData) => Callback.empty),`
`202`	`202`	`<.div("Abc")`
`203`	`203`	`)`
`204`		`- "supportOnStop" -`
	`204`	`+ test("supportOnStop"):`
`205`	`205`	`Draggable(Draggable.props(onStop = (_: MouseEvent, _: DraggableData) => Callback.empty),`
`206`	`206`	`<.div("Abc")`
`207`	`207`	`)`
`208`		`- "supportPosition" - {`
	`208`	`+ test("supportPosition") {`
`209`	`209`	`Draggable(Draggable.props(), <.div("Abc")).props.position.toOption ==> None`
`210`	`210`	`val draggable =`
`211`	`211`	`Draggable(Draggable.props(position = ControlPosition(1, 2)), <.div("Abc"))`
`@@ -218,7 +218,7 @@ object DraggableTests extends TestSuite {`
`218`	`218`	`draggable.props.position.toOption.map(_.x) ==> Some(1)`
`219`	`219`	`draggable.props.position.toOption.map(_.y) ==> Some(2)`
`220`	`220`	`}`
`221`		`- "supportPositionOffset" - {`
	`221`	`+ test("supportPositionOffset") {`
`222`	`222`	`Draggable(Draggable.props(), <.div("Abc")).props.positionOffset.toOption ==> None`
`223`	`223`	`val draggable =`
`224`	`224`	`Draggable(Draggable.props(positionOffset = PositionOffsetControlPosition("10%", "20%")),`