diff --git a/ApprovalTests.Swift/Core/Options.swift b/ApprovalTests.Swift/Core/Options.swift index 11aec24..6bce227 100644 --- a/ApprovalTests.Swift/Core/Options.swift +++ b/ApprovalTests.Swift/Core/Options.swift @@ -83,7 +83,7 @@ public struct Options { FileOptions(data) } - public func getNamer(_ path: String, _ function:String) -> ApprovalNamer { + public func getNamer(_ path: String, _ function: String) -> ApprovalNamer { let c = data[.namer] as? (String, String) -> ApprovalNamer ?? Approvals.makeNamer return c(path, function) } diff --git a/ApprovalTests.Swift/Namer/NamerFactory.swift b/ApprovalTests.Swift/Namer/NamerFactory.swift index d1b2675..83b8cbf 100644 --- a/ApprovalTests.Swift/Namer/NamerFactory.swift +++ b/ApprovalTests.Swift/Namer/NamerFactory.swift @@ -3,7 +3,7 @@ import UIKit #endif public enum NamerFactory { - public static func withParameters(options: Options = Options(), _ parameters: String ...) -> Options { + public static func withParameters(options: Options = Options(), _ parameters: String...) -> Options { return withParameters(options: options, parameters) } @@ -27,7 +27,7 @@ public enum NamerFactory { withParameters(options: options, getMachineName()) } - public static func withAdditionalParameters(_ parameters: String ...) -> (Options) -> Options { + public static func withAdditionalParameters(_ parameters: String...) -> (Options) -> Options { return { (options: Options) -> Options in withParameters(options: options, parameters) } diff --git a/ApprovalTests.Swift/Namer/ParameterizedNamer.swift b/ApprovalTests.Swift/Namer/ParameterizedNamer.swift index bf31de0..6940a0f 100644 --- a/ApprovalTests.Swift/Namer/ParameterizedNamer.swift +++ b/ApprovalTests.Swift/Namer/ParameterizedNamer.swift @@ -1,11 +1,11 @@ class ParameterizedNamer: Namer { private let parameters: [String] - public init(_ filePath: String, _ function: String, _ parameters: [String]) { + public init(_ filePath: String, _ function: String, _ parameters: [String]) { self.parameters = parameters super.init(filePath, function) } - + override func sourceFilePath() -> String { super.sourceFilePath() + "." + parameters.joined(separator: ".") } diff --git a/ApprovalTests_SwiftTests/ApprovalTests_SwiftTests.swift b/ApprovalTests_SwiftTests/ApprovalTests_SwiftTests.swift index 0b523b9..95b8985 100644 --- a/ApprovalTests_SwiftTests/ApprovalTests_SwiftTests.swift +++ b/ApprovalTests_SwiftTests/ApprovalTests_SwiftTests.swift @@ -12,7 +12,7 @@ final class ApprovalTests_SwiftTests: XCTestCase { } func testSourceFilePath() throws { - let name = Approvals.makeNamer(forFile: #file, function: #function) + let name = Approvals.makeNamer(forFile: #file, function: #function) let sourceFilePath = name.sourceFilePath() XCTAssertTrue( sourceFilePath.hasSuffix( diff --git a/ApprovalTests_SwiftTests/Namer/NamerTests.swift b/ApprovalTests_SwiftTests/Namer/NamerTests.swift index 2727dbd..14017d3 100644 --- a/ApprovalTests_SwiftTests/Namer/NamerTests.swift +++ b/ApprovalTests_SwiftTests/Namer/NamerTests.swift @@ -10,14 +10,13 @@ final class NamerTests: XCTestCase { try Approvals.verify("# Title\n> Quoted text", Approvals.Names.withParameters("story1").forFile.with(extensionWithDot: ".md")) } - func test_parameters_async() async throws { + func test_parameters_async() async throws { try Approvals.verify("# Title\n> Quoted text", Approvals.Names.withParameters("story1").forFile.with(extensionWithDot: ".md")) } func test_multipleParameters() throws { - let foo = Approvals.Names.withParameters("story1") - .and(Approvals.Names.withAdditionalParameters("part1")) - let name: String = foo.getNamer("", #function).sourceFilePath() + let foo = Approvals.Names.withParameters("story1").and(Approvals.Names.withAdditionalParameters("part1")) + let name = foo.getNamer("", #function).sourceFilePath() XCTAssertEqual(name, ".test_multipleParameters.story1.part1") }