TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-03-28 01:35:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2664 from eikek/update-munit

Browse Source 
Update munit to 1.0.0, munit-cats-effect to 2.0.0
This commit is contained in:
mergify[bot] 2024-05-28 19:22:48 +00:00 committed by GitHub
commit 2fe49fa2b1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/addonlib/src/test/scala/docspell/addons/Fixtures.scala
View File

@ -58,7 +58,7 @@ trait Fixtures extends TestLoggingConfig { self: CatsEffectSuite =>
Path(s"/tmp/target/test-temp") Path(s"/tmp/target/test-temp")
val tempDir = val tempDir =
ResourceFixture[Path]( ResourceFunFixture[Path](
Resource.eval(Files[IO].createDirectories(baseTempDir)) *> Resource.eval(Files[IO].createDirectories(baseTempDir)) *>
Files[IO] Files[IO]
.tempDirectory(baseTempDir.some, "run-", PosixPermissions.fromOctal("777")) .tempDirectory(baseTempDir.some, "run-", PosixPermissions.fromOctal("777"))

2
modules/common/src/test/scala/docspell/common/util/DirectoryTest.scala
View File

@ -16,7 +16,7 @@ import munit.CatsEffectSuite
class DirectoryTest extends CatsEffectSuite with TestLoggingConfig { class DirectoryTest extends CatsEffectSuite with TestLoggingConfig {
val logger = docspell.logging.getLogger[IO] val logger = docspell.logging.getLogger[IO]
val tempDir = ResourceFixture( val tempDir = ResourceFunFixture(
Files[IO].tempDirectory(Path("target").some, "directory-test-", None) Files[IO].tempDirectory(Path("target").some, "directory-test-", None)
) )

2
modules/files/src/test/scala/docspell/files/ZipTest.scala
View File

@ -19,7 +19,7 @@ import munit._
class ZipTest extends CatsEffectSuite with TestLoggingConfig { class ZipTest extends CatsEffectSuite with TestLoggingConfig {
val logger = docspell.logging.getLogger[IO] val logger = docspell.logging.getLogger[IO]
val tempDir = ResourceFixture( val tempDir = ResourceFunFixture(
Files[IO].tempDirectory(Path("target").some, "zip-test-", None) Files[IO].tempDirectory(Path("target").some, "zip-test-", None)
) )

4
modules/pubsub/naive/src/test/scala/docspell/pubsub/naive/Fixtures.scala
View File

@ -20,9 +20,9 @@ import org.typelevel.ci._
trait Fixtures extends HttpClientOps { self: CatsEffectSuite => trait Fixtures extends HttpClientOps { self: CatsEffectSuite =>
val pubsubEnv = ResourceFixture(Fixtures.envResource("node-1")) val pubsubEnv = ResourceFunFixture(Fixtures.envResource("node-1"))
val pubsubT = ResourceFixture { val pubsubT = ResourceFunFixture {
Fixtures Fixtures
.envResource("node-1") .envResource("node-1")
.flatMap(_.pubSub) .flatMap(_.pubSub)

2
modules/store/src/test/scala/docspell/store/DatabaseTest.scala
View File

@ -66,7 +66,7 @@ trait DatabaseTest
} yield res } yield res
) )
lazy val newH2DataSource = ResourceFixture(for { lazy val newH2DataSource = ResourceFunFixture(for {
jdbc <- Resource.eval(IO(StoreFixture.memoryDB(UUID.randomUUID().toString))) jdbc <- Resource.eval(IO(StoreFixture.memoryDB(UUID.randomUUID().toString)))
ds <- StoreFixture.dataSource(jdbc) ds <- StoreFixture.dataSource(jdbc)
} yield (jdbc, ds)) } yield (jdbc, ds))

4
modules/store/src/test/scala/docspell/store/StoreFixture.scala
View File

@ -26,7 +26,7 @@ trait StoreFixture extends CatsEffectFunFixtures { self: CatsEffectSuite =>
def schemaMigrateConfig = def schemaMigrateConfig =
StoreFixture.schemaMigrateConfig StoreFixture.schemaMigrateConfig
val xa = ResourceFixture { val xa = ResourceFunFixture {
val cfg = StoreFixture.memoryDB("test") val cfg = StoreFixture.memoryDB("test")
for { for {
ds <- StoreFixture.dataSource(cfg) ds <- StoreFixture.dataSource(cfg)
@ -35,7 +35,7 @@ trait StoreFixture extends CatsEffectFunFixtures { self: CatsEffectSuite =>
} yield xa } yield xa
} }
val store = ResourceFixture { val store = ResourceFunFixture {
val cfg = StoreFixture.memoryDB("test") val cfg = StoreFixture.memoryDB("test")
for { for {
store <- StoreFixture.store(cfg) store <- StoreFixture.store(cfg)

8
project/Dependencies.scala
View File

@ -33,8 +33,8 @@ object Dependencies {
val Log4sVersion = "1.10.0" val Log4sVersion = "1.10.0"
val LogbackVersion = "1.2.10" val LogbackVersion = "1.2.10"
val MariaDbVersion = "3.4.0" val MariaDbVersion = "3.4.0"
val MUnitVersion = "0.7.29" val MUnitVersion = "1.0.0"
val MUnitCatsEffectVersion = "1.0.7" val MUnitCatsEffectVersion = "2.0.0"
val PdfboxVersion = "3.0.2" val PdfboxVersion = "3.0.2"
val PdfjsViewerVersion = "2.12.313" val PdfjsViewerVersion = "2.12.313"
val PoiVersion = "4.1.2" val PoiVersion = "4.1.2"
@ -49,7 +49,7 @@ object Dependencies {
val TikaVersion = "2.9.2" val TikaVersion = "2.9.2"
val YamuscaVersion = "0.10.0" val YamuscaVersion = "0.10.0"
val SwaggerUIVersion = "5.17.11" val SwaggerUIVersion = "5.17.11"
val TestContainerVersion = "0.40.14" val TestContainerVersion = "0.41.3"
val TwelveMonkeysVersion = "3.10.1" val TwelveMonkeysVersion = "3.10.1"
val JQueryVersion = "3.5.1" val JQueryVersion = "3.5.1"
@ -326,7 +326,7 @@ object Dependencies {
val munit = Seq( val munit = Seq(
"org.scalameta" %% "munit" % MUnitVersion, "org.scalameta" %% "munit" % MUnitVersion,
"org.scalameta" %% "munit-scalacheck" % MUnitVersion, "org.scalameta" %% "munit-scalacheck" % MUnitVersion,
"org.typelevel" %% "munit-cats-effect-3" % MUnitCatsEffectVersion "org.typelevel" %% "munit-cats-effect" % MUnitCatsEffectVersion
) )
val kindProjectorPlugin = "org.typelevel" %% "kind-projector" % KindProjectorVersion val kindProjectorPlugin = "org.typelevel" %% "kind-projector" % KindProjectorVersion