Fix root subfolder parent (JohnSundell#75)

Azarhi-Software · Sep 27, 2019 · 6568bfe · 6568bfe
1 parent 85d7895
commit 6568bfe
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/Sources/Files.swift b/Sources/Files.swift
@@ -249,6 +249,7 @@ fileprivate extension Storage {
         guard path != "/" else { return nil }
         let url = URL(fileURLWithPath: path)
         let components = url.pathComponents.dropFirst().dropLast()
+        guard !components.isEmpty else { return "/" }
         return "/" + components.joined(separator: "/") + "/"
     }
 

diff --git a/Tests/FilesTests/FilesTests.swift b/Tests/FilesTests/FilesTests.swift
@@ -537,6 +537,14 @@ class FilesTests: XCTestCase {
         }
     }
 
+    func testRootSubfolderParentIsRoot() {
+        performTest {
+            let rootFolder = try Folder(path: "/")
+            let subfolder = rootFolder.subfolders.first
+            XCTAssertEqual(subfolder?.parent, rootFolder)
+        }
+    }
+
     func testOpeningFileWithEmptyPathThrows() {
         performTest {
             try assert(File(path: ""), throwsErrorOfType: LocationError.self)
@@ -869,6 +877,7 @@ class FilesTests: XCTestCase {
         ("testModificationDate", testModificationDate),
         ("testParent", testParent),
         ("testRootFolderParentIsNil", testRootFolderParentIsNil),
+        ("testRootSubfolderParentIsRoot", testRootSubfolderParentIsRoot),
         ("testOpeningFileWithEmptyPathThrows", testOpeningFileWithEmptyPathThrows),
         ("testDeletingNonExistingFileThrows", testDeletingNonExistingFileThrows),
         ("testWritingDataToFile", testWritingDataToFile),