Merge pull request #42 from stefanceriu/stefan/37

Fixes #37 - Build correct config file paths, update tests
BarredEwe · Mar 11, 2024 · bf7fa45 · bf7fa45
2 parents 7c70aa3 + 982b207
commit bf7fa45
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 48 deletions.
diff --git a/Binaries/PrefireBinary.artifactbundle/info.json b/Binaries/PrefireBinary.artifactbundle/info.json
@@ -3,10 +3,10 @@
     "artifacts": {
         "PrefireBinary": {
             "type": "executable",
-            "version": "2.0.3",
+            "version": "2.0.4",
             "variants": [
                 {
-                    "path": "prefire-2.0.3-macos/bin/prefire",
+                    "path": "prefire-2.0.4-macos/bin/prefire",
                     "supportedTriples": ["x86_64-apple-macosx", "arm64-apple-macosx"]
                 },
             ]

diff --git a/Binaries/PrefireBinary.artifactbundle/prefire-2.0.3-macos/bin/prefire b/Binaries/PrefireBinary.artifactbundle/prefire-2.0.3-macos/bin/prefire
diff --git a/Binaries/PrefireBinary.artifactbundle/prefire-2.0.4-macos/bin/prefire b/Binaries/PrefireBinary.artifactbundle/prefire-2.0.4-macos/bin/prefire
diff --git a/PrefireExecutable/Sources/prefire/Commands/Tests/GenerateTestsCommand.swift b/PrefireExecutable/Sources/prefire/Commands/Tests/GenerateTestsCommand.swift
@@ -38,11 +38,15 @@ struct GeneratedTestsOptions {
         self.sourcery = sourcery
         self.target = config?.tests.target ?? target
         self.testTarget = testTarget
-        if let template = config?.tests.template, let testTargetURL = testTargetPath.flatMap(URL.init(string:)) {
-            self.template = testTargetURL.deletingLastPathComponent().appending(path: template).absoluteString
+
+        if let template = config?.tests.template, let testTargetPath {
+            let testTargetURL = URL(filePath: testTargetPath)
+            let templateURL = testTargetURL.appending(path: template)
+            self.template = templateURL.absoluteURL.path()
         } else {
             self.template = template
         }
+
         self.sources = sources
         self.output = config?.tests.testFilePath ?? output
         prefireEnabledMarker = config?.tests.previewDefaultEnabled ?? true

diff --git a/PrefireExecutable/Sources/prefire/Commands/Version/Version.swift b/PrefireExecutable/Sources/prefire/Commands/Version/Version.swift
@@ -5,7 +5,7 @@ extension Prefire {
     struct Version: ParsableCommand {
         static let configuration = CommandConfiguration(abstract: "Display the current version of Prefire")
 
-        static var value: String = "2.0.3"
+        static var value: String = "2.0.4"
 
         func run() throws {
             print(Self.value)

diff --git a/PrefireExecutable/Sources/prefire/Config/Config.swift b/PrefireExecutable/Sources/prefire/Config/Config.swift
@@ -2,7 +2,6 @@ import Foundation
 
 private enum Constants {
     static let separtor = ":"
-    static let fileMark = "file://"
 }
 
 struct Config {
@@ -124,8 +123,8 @@ extension Config {
         let possibleConfigPaths = ConfigPathBuilder.possibleConfigPaths(for: configPath, testTargetPath: testTargetPath)
 
         for path in possibleConfigPaths {
-            guard let configUrl = URL(string: Constants.fileMark + path),
-                  FileManager.default.fileExists(atPath: configUrl.path),
+            let configUrl = URL(filePath: path)
+            guard FileManager.default.fileExists(atPath: configUrl.path),
                   let configDataString = try? String(contentsOf: configUrl, encoding: .utf8) else { continue }
 
             if verbose {

diff --git a/PrefireExecutable/Sources/prefire/Config/ConfigPathBuilder.swift b/PrefireExecutable/Sources/prefire/Config/ConfigPathBuilder.swift
@@ -9,30 +9,26 @@ enum ConfigPathBuilder {
     /// - Returns: An array of possible paths for the configuration file
     static func possibleConfigPaths(for configPath: String?, testTargetPath: String?) -> [String] {
         var possibleConfigPaths = [String]()
-
-        if var configPath = configPath {
-            // Check if the provided path is absolute and remove leading slash if so
-            if configPath.hasPrefix("/") {
-                configPath.removeFirst()
-            }
-            if configPath.hasSuffix("/") {
-                configPath.removeLast()
+
+        for path in [testTargetPath, configPath] {
+            guard let path else {
+                continue
             }
-
-            possibleConfigPaths.append(configPath)
-            possibleConfigPaths.append(FileManager.default.currentDirectoryPath + "/\(configPath)")
-
-            if !configPath.hasSuffix(configFileName) {
-                possibleConfigPaths = possibleConfigPaths.map { $0 + "/\(configFileName)" }
+
+            // This will build the absolute path relative to the current directory
+            var configURL = URL(filePath: path)
+
+            // Add the config file name if not provided
+            if configURL.lastPathComponent != configFileName {
+                configURL.append(component: configFileName)
             }
-        } else {
-            // Add the default path if no specific one is provided
-            possibleConfigPaths.append(FileManager.default.currentDirectoryPath + "/\(configFileName)")
-        }
-
-        if let testTargetPath {
-            possibleConfigPaths.insert(testTargetPath + "/\(configFileName)", at: 0)
+
+            possibleConfigPaths.append(configURL.absoluteURL.path())
         }
+
+        // Add the default path
+        let configURL = URL(filePath: configFileName) // Relative to the current directory
+        possibleConfigPaths.append(configURL.absoluteURL.path())
 
         return possibleConfigPaths
     }

diff --git a/PrefireExecutable/Tests/PrefireTests/ConfigPathBuilderTests.swift b/PrefireExecutable/Tests/PrefireTests/ConfigPathBuilderTests.swift
@@ -20,7 +20,7 @@ class ConfigPathBuilderTests: XCTestCase {
         let result = ConfigPathBuilder.possibleConfigPaths(for: nil, testTargetPath: testTargetPath)
 
         let expectableResult = [
-            testTargetPath + "/\(configFileName)",
+            FileManager.default.currentDirectoryPath + "/\(testTargetPath)" + "/\(configFileName)",
             FileManager.default.currentDirectoryPath + "/\(configFileName)",
         ]
 
@@ -32,52 +32,47 @@ class ConfigPathBuilderTests: XCTestCase {
         let result = ConfigPathBuilder.possibleConfigPaths(for: configPath, testTargetPath: testTargetPath)
 
         let expectableResult = [
-            testTargetPath + "/\(configFileName)",
-            configPath,
+            FileManager.default.currentDirectoryPath + "/\(testTargetPath)" + "/\(configFileName)",
             FileManager.default.currentDirectoryPath + "/\(configPath)",
+            FileManager.default.currentDirectoryPath + "/\(configFileName)"
         ]
 
         XCTAssertEqual(result, expectableResult)
     }
 
     func test_possibleConfigPathsWithConfigSeparated() {
-        var configPath = "/Tests/" + configFileName
+        let configPath = "Tests/" + configFileName
         let result = ConfigPathBuilder.possibleConfigPaths(for: configPath, testTargetPath: testTargetPath)
 
-        configPath.removeFirst()
         let expectableResult = [
-            testTargetPath + "/\(configFileName)",
-            configPath,
+            FileManager.default.currentDirectoryPath + "/\(testTargetPath)" + "/\(configFileName)",
             FileManager.default.currentDirectoryPath + "/\(configPath)",
+            FileManager.default.currentDirectoryPath + "/\(configFileName)"
         ]
 
         XCTAssertEqual(result, expectableResult)
     }
 
     func test_possibleConfigPathsWithConfigNoFileName() {
-        var configPath = "/Tests/"
+        let configPath = "Tests/"
         let result = ConfigPathBuilder.possibleConfigPaths(for: configPath, testTargetPath: testTargetPath)
 
-        configPath.removeFirst()
-        configPath.removeLast()
         let expectableResult = [
-            testTargetPath + "/\(configFileName)",
-            configPath + "/\(configFileName)",
-            FileManager.default.currentDirectoryPath + "/\(configPath)/\(configFileName)",
+            FileManager.default.currentDirectoryPath + "/\(testTargetPath)" + "/\(configFileName)",
+            FileManager.default.currentDirectoryPath + "/\(configPath)" + "\(configFileName)",
+            FileManager.default.currentDirectoryPath + "/\(configFileName)"
         ]
 
         XCTAssertEqual(result, expectableResult)
     }
 
     func test_possibleConfigPathsWithConfigNoFileNameNoTestingTarget() {
-        var configPath = "/Tests/"
+        let configPath = "Tests/"
         let result = ConfigPathBuilder.possibleConfigPaths(for: configPath, testTargetPath: nil)
 
-        configPath.removeFirst()
-        configPath.removeLast()
         let expectableResult = [
-            configPath + "/\(configFileName)",
-            FileManager.default.currentDirectoryPath + "/\(configPath)/\(configFileName)",
+            FileManager.default.currentDirectoryPath + "/\(configPath)" + "\(configFileName)",
+            FileManager.default.currentDirectoryPath + "/\(configFileName)"
         ]
 
         XCTAssertEqual(result, expectableResult)

diff --git a/README.md b/README.md
@@ -206,7 +206,9 @@ test_configuration:
   - template_file_path: CustomPreviewTests.stencil
   - simulator_device: "iPhone15,2"
   - required_os: 16
-  - snapshot_devices: [iPhone 14, iPad]
+  - snapshot_devices:
+  	- iPhone 14
+  	- iPad
   - preview_default_enabled: true
   - imports:
     - UIKit