Observe changes done by scalafmt

Author: fthomas

modules/core/src/test/scala/org/scalasteward/core/edit/EditAlgTest.scala

@@ -70,12 +70,12 @@ class EditAlgTest extends FunSuite {
     val buildSbt = (repoDir / "build.sbt") -> "\n"
     val target = repoDir / "target"
     // this file should not be read because it's under target which is git ignored
-    val targetScalaFile = (target / "SomeFile.scala") -> s"""object Test {"2.0.0"}"""
+    val targetScalaFile = target / "SomeFile.scala"
 
     val state = MockState.empty
       .copy(execCommands = true)
       .initGitRepo(repoDir, scalafmtConf -> scalafmtConfContent, buildSbt, gitignore)
-      .flatMap(_.addFiles(targetScalaFile))
+      .flatMap(_.addFiles(targetScalaFile -> s""" object Test {"2.0.0"} """))
       .flatMap(editAlg.applyUpdate(data, update).runS)
       .unsafeRunSync()
 
@@ -105,7 +105,7 @@ class EditAlgTest extends FunSuite {
             |""".stripMargin,
         buildSbt,
         gitignore,
-        targetScalaFile
+        targetScalaFile -> s"""object Test { "2.0.0" }\n"""
       )
     )
 

modules/core/src/test/scala/org/scalasteward/core/io/MockProcessAlg.scala

@@ -1,5 +1,6 @@
 package org.scalasteward.core.io
 
+import cats.syntax.all._
 import cats.data.Kleisli
 import cats.effect.IO
 import org.scalasteward.core.application.Config.ProcessCfg
@@ -11,19 +12,30 @@ object MockProcessAlg {
     new ProcessAlg(config)({ args =>
       Kleisli { ctx =>
         for {
-          state <- ctx.get
+          state0 <- ctx.get
           cmd = Cmd(
             args.extraEnv.map { case (k, v) => s"$k=$v" } ++
               args.workingDirectory.map(_.toString).toList ++
               args.command.toList
           )
-          _ <- ctx.set(state.appendTraceEntry(cmd))
-          res <- state.commandOutputs.get(cmd) match {
-            case Some(output)               => IO.fromEither(output)
-            case None if state.execCommands => ProcessAlgTest.ioProcessAlg.execImpl(args)
-            case None                       => IO.pure(List.empty)
+          state1 = state0.appendTraceEntry(cmd)
+          _ <- ctx.set(state1)
+          res <- state1.commandOutputs.get(cmd) match {
+            case Some(output) => IO.fromEither(output).tupleRight(state1.files)
+            case None if state1.execCommands =>
+              for {
+                output <- ProcessAlgTest.ioProcessAlg.execImpl(args)
+                // External processes can modify tracked files. We read them again here so that
+                // they are in sync with the files in the filesystem.
+                files <- state1.files.keys.toList.traverse { file =>
+                  FileAlgTest.ioFileAlg.readFile(file).map(_.getOrElse("")).tupleLeft(file)
+                }
+              } yield (output, files.toMap)
+            case None => IO.pure((List.empty, state1.files))
           }
-        } yield res
+          (output, files) = res
+          _ <- ctx.set(state1.copy(files = files))
+        } yield output
       }
     })
 }