use full subpaths of suites instead of just file name

siriusxm · Sep 18, 2024 · f5c4708 · f5c4708
1 parent 5ee6963
commit f5c4708
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 15 deletions.
diff --git a/modules/core/src/main/scala/com/siriusxm/snapshot4s/FileSnapshot.scala b/modules/core/src/main/scala/com/siriusxm/snapshot4s/FileSnapshot.scala
@@ -26,13 +26,11 @@ private[snapshot4s] object FileSnapshot {
       eq: SnapshotEq[String],
       resultLike: ResultLike[String, E]
   ): E = resultLike { () =>
-    val sourceFileName       = Locations.getFileName(sourceFile)
+    val relativePath         = Locations.relativeSourceFilePath(sourceFile, config)
     val absoluteSnapshotPath = config.resourceDirectory / RelPath(snapshotPath)
     def writePatchFile() = {
       val patchPath =
-        config.outputDirectory / RelPath("resource-patch") / RelPath(sourceFileName) / RelPath(
-          snapshotPath
-        )
+        config.outputDirectory / RelPath("resource-patch") / relativePath / RelPath(snapshotPath)
       patchPath.write(found)
     }
     if (absoluteSnapshotPath.exists()) {

diff --git a/modules/core/src/main/scala/com/siriusxm/snapshot4s/Locations.scala b/modules/core/src/main/scala/com/siriusxm/snapshot4s/Locations.scala
@@ -18,9 +18,6 @@ package snapshot4s
 
 private[snapshot4s] object Locations {
 
-  private[snapshot4s] def getFileName(filePath: String): String =
-    filePath.split("/").last
-
   private[snapshot4s] def relativeSourceFilePath(
       sourceFile: String,
       config: SnapshotConfig

diff --git a/modules/core/src/test/scala/com/siriusxm/snapshot4s/LocationsSpec.scala b/modules/core/src/test/scala/com/siriusxm/snapshot4s/LocationsSpec.scala
@@ -56,10 +56,4 @@ We have detected the following configuration:
 
   }
 
-  pureTest("calculates file name from path") {
-    val fileName = "MySuites.cala"
-    val path     = s"/path/to/$fileName"
-    expect.eql(Locations.getFileName(path), fileName)
-  }
-
 }
diff --git a/modules/plugin/src/main/scala/com/siriusxm/snapshot/Snapshot4sPlugin.scala b/modules/plugin/src/main/scala/com/siriusxm/snapshot/Snapshot4sPlugin.scala
@@ -115,8 +115,8 @@ object generated {
   private def locateResourceFile(resourcePatchDir: File, patchFile: File, resourceDir: File) = {
     val relativePath =
       IO.relativize(resourcePatchDir, patchFile).get
-    // relative path contains file name like "MyTest.scala" as it's first segment, we need to remove that
-    val withoutSourceTestFileName = relativePath.split("/").tail.mkString("/")
+    // relative path starts with subpath like "src/test/scala/MyTest.scala" we need to remove that
+    val withoutSourceTestFileName = relativePath.split("\\.scala/").tail.mkString("/")
     resourceDir / withoutSourceTestFileName
   }