Support relative paths for fileGroups in includes (#1534)

shnhrrsn · web-flow · commit 26de8f1c9bb6 · 2025-04-05T16:10:18.000+11:00
diff --git a/Sources/ProjectSpec/Project.swift b/Sources/ProjectSpec/Project.swift
@@ -242,7 +242,8 @@ extension Project: PathContainer {
             .object("schemes", Scheme.pathProperties),
             .object("projectReferences", ProjectReference.pathProperties),
             .object("packages", SwiftPackage.pathProperties),
-            .string("localPackages")
+            .string("localPackages"),
+            .string("fileGroups")
         ]
     }
 }
diff --git a/Tests/Fixtures/duplicated_include/duplicated_import_sut.yml b/Tests/Fixtures/duplicated_include/duplicated_import_sut.yml
@@ -2,7 +2,8 @@ include:
   - duplicated_import_transitive.yml
   - duplicated_import_root.yml
   - duplicated_import_root.yml
-  - different_path/duplicated_import_root.yml
+  - path: different_path/duplicated_import_root.yml
+    relativePaths: false
 name: DuplicatedImportDependent
 targets:
   IncludedTarget:
diff --git a/Tests/Fixtures/paths_test/included_paths_test.yml b/Tests/Fixtures/paths_test/included_paths_test.yml
@@ -1,8 +1,11 @@
+name: IncludedPathsTest
 include:
   - recursive_test/recursive_test.yml
   - same_relative_path_test/same_relative_path_test.yml
   - path: relative_local_package/inc.yml
     relativePaths: true
+  - path: relative_file_groups/inc.yml
+    relativePaths: true
 configFiles:
   IncludedConfig: config
 projectReferences:
diff --git a/Tests/Fixtures/paths_test/relative_file_groups/TestFile.md b/Tests/Fixtures/paths_test/relative_file_groups/TestFile.md
@@ -0,0 +1 @@
+This is a test file for relative file groups
diff --git a/Tests/Fixtures/paths_test/relative_file_groups/inc.yml b/Tests/Fixtures/paths_test/relative_file_groups/inc.yml
@@ -0,0 +1,2 @@
+fileGroups:
+  - TestFile.md
diff --git a/Tests/ProjectSpecTests/SpecLoadingTests.swift b/Tests/ProjectSpecTests/SpecLoadingTests.swift
@@ -197,6 +197,8 @@ class SpecLoadingTests: XCTestCase {
                 try expect(project.packages) == [
                     "LocalPackage": .local(path: "paths_test/relative_local_package/LocalPackage", group: nil, excludeFromProject: false),
                 ]
+
+                try expect(project.fileGroups.contains("paths_test/relative_file_groups/TestFile.md")) == true
             }
 
             $0.it("respects directory expansion preference") {

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,8 @@ extension Project: PathContainer {`
`242`	`242`	`.object("schemes", Scheme.pathProperties),`
`243`	`243`	`.object("projectReferences", ProjectReference.pathProperties),`
`244`	`244`	`.object("packages", SwiftPackage.pathProperties),`
`245`		`- .string("localPackages")`
	`245`	`+ .string("localPackages"),`
	`246`	`+ .string("fileGroups")`
`246`	`247`	`]`
`247`	`248`	`}`
`248`	`249`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+This is a test file for relative file groups`
Original file line number	Diff line number	Diff line change
`@@ -197,6 +197,8 @@ class SpecLoadingTests: XCTestCase {`
`197`	`197`	`try expect(project.packages) == [`
`198`	`198`	`"LocalPackage": .local(path: "paths_test/relative_local_package/LocalPackage", group: nil, excludeFromProject: false),`
`199`	`199`	`]`
	`200`	`+`
	`201`	`+ try expect(project.fileGroups.contains("paths_test/relative_file_groups/TestFile.md")) == true`
`200`	`202`	`}`
`201`	`203`
`202`	`204`	`$0.it("respects directory expansion preference") {`