mirror of
https://github.com/TheAnachronism/docspell.git
synced 2025-06-21 18:08:25 +00:00
Merge pull request #2664 from eikek/update-munit
Update munit to 1.0.0, munit-cats-effect to 2.0.0
This commit is contained in:
@ -58,7 +58,7 @@ trait Fixtures extends TestLoggingConfig { self: CatsEffectSuite =>
|
||||
Path(s"/tmp/target/test-temp")
|
||||
|
||||
val tempDir =
|
||||
ResourceFixture[Path](
|
||||
ResourceFunFixture[Path](
|
||||
Resource.eval(Files[IO].createDirectories(baseTempDir)) *>
|
||||
Files[IO]
|
||||
.tempDirectory(baseTempDir.some, "run-", PosixPermissions.fromOctal("777"))
|
||||
|
@ -16,7 +16,7 @@ import munit.CatsEffectSuite
|
||||
|
||||
class DirectoryTest extends CatsEffectSuite with TestLoggingConfig {
|
||||
val logger = docspell.logging.getLogger[IO]
|
||||
val tempDir = ResourceFixture(
|
||||
val tempDir = ResourceFunFixture(
|
||||
Files[IO].tempDirectory(Path("target").some, "directory-test-", None)
|
||||
)
|
||||
|
||||
|
@ -19,7 +19,7 @@ import munit._
|
||||
|
||||
class ZipTest extends CatsEffectSuite with TestLoggingConfig {
|
||||
val logger = docspell.logging.getLogger[IO]
|
||||
val tempDir = ResourceFixture(
|
||||
val tempDir = ResourceFunFixture(
|
||||
Files[IO].tempDirectory(Path("target").some, "zip-test-", None)
|
||||
)
|
||||
|
||||
|
@ -20,9 +20,9 @@ import org.typelevel.ci._
|
||||
|
||||
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
|
||||
.envResource("node-1")
|
||||
.flatMap(_.pubSub)
|
||||
|
@ -66,7 +66,7 @@ trait DatabaseTest
|
||||
} yield res
|
||||
)
|
||||
|
||||
lazy val newH2DataSource = ResourceFixture(for {
|
||||
lazy val newH2DataSource = ResourceFunFixture(for {
|
||||
jdbc <- Resource.eval(IO(StoreFixture.memoryDB(UUID.randomUUID().toString)))
|
||||
ds <- StoreFixture.dataSource(jdbc)
|
||||
} yield (jdbc, ds))
|
||||
|
@ -26,7 +26,7 @@ trait StoreFixture extends CatsEffectFunFixtures { self: CatsEffectSuite =>
|
||||
def schemaMigrateConfig =
|
||||
StoreFixture.schemaMigrateConfig
|
||||
|
||||
val xa = ResourceFixture {
|
||||
val xa = ResourceFunFixture {
|
||||
val cfg = StoreFixture.memoryDB("test")
|
||||
for {
|
||||
ds <- StoreFixture.dataSource(cfg)
|
||||
@ -35,7 +35,7 @@ trait StoreFixture extends CatsEffectFunFixtures { self: CatsEffectSuite =>
|
||||
} yield xa
|
||||
}
|
||||
|
||||
val store = ResourceFixture {
|
||||
val store = ResourceFunFixture {
|
||||
val cfg = StoreFixture.memoryDB("test")
|
||||
for {
|
||||
store <- StoreFixture.store(cfg)
|
||||
|
Reference in New Issue
Block a user