diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 3320306..d33b25b 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -16,6 +16,13 @@ jobs: steps: - uses: actions/checkout@v4 + - uses: swift-actions/setup-swift@v2 + with: + swift-version: "6.1" + - name: Install SwiftLint + run: brew install swiftlint + - name: Check Linting + run: swiftlint - name: Build run: swift build -v - name: Run tests diff --git a/Sources/Network Settings/HostSettingsReader.swift b/Sources/Network Settings/HostSettingsReader.swift deleted file mode 100644 index 4c31d96..0000000 --- a/Sources/Network Settings/HostSettingsReader.swift +++ /dev/null @@ -1,36 +0,0 @@ -// -// HostSettingsReader.swift -// QuickHatch -// -// Created by Daniel Koster on 5/14/21. -// Copyright © 2021 DaVinci Labs. All rights reserved. -// - -import Foundation - -//public protocol HostSettingsReader { -// func read() -> Settings -//} -// -//private class HostConfigReader { -// class var values: HostSettings { -// let data = try! PropertyListSerialization.data(fromPropertyList: Bundle.init(for: Host.self).infoDictionary!, -// format: PropertyListSerialization.PropertyListFormat.binary, -// options: 0) -// let plistDecoder = PropertyListDecoder() -// return try! plistDecoder.decode(HostSettings.self, from: data) -// -// } -//} - -//private struct HostSettings: Decodable { -// let apiKey: String -// let host: String -// let baseUrl: String -// -// enum CodingKeys: String, CodingKey { -// case apiKey = "Api Key" -// case host = "Host" -// case baseUrl = "Base URL" -// } -//} diff --git a/Tests/TestCases/CertificatePinning/URLSessionPinningDelegateTests.swift b/Tests/TestCases/CertificatePinning/URLSessionPinningDelegateTests.swift index ce9163a..0924576 100644 --- a/Tests/TestCases/CertificatePinning/URLSessionPinningDelegateTests.swift +++ b/Tests/TestCases/CertificatePinning/URLSessionPinningDelegateTests.swift @@ -20,23 +20,23 @@ struct URLSessionPinningDelegateTests { } private struct TestCases { - static let whenChallengeIsNilExpectInvalidResults = TestMetadata(challenge: Stubs.CertificatePinner.fakeChallenge(with: nil), + static let whenChallengeIsNilExpectInvalid = TestMetadata(challenge: Stubs.CertificatePinner.fakeChallenge(with: nil), certificatePinnerIsServerTrustedResult: false, credentialResult: nil, result: .cancelAuthenticationChallenge) - static let whenChallengeIsValidAndServerIsNotTrustedExpectInvalidResults = TestMetadata(challenge: Stubs.CertificatePinner.fakeChallenge(with: Stubs.CertificatePinner.certificate), + static let whenChallengeIsValidAndServerIsNotTrustedExpectInvalid = TestMetadata(challenge: Stubs.CertificatePinner.fakeChallenge(with: Stubs.CertificatePinner.certificate), certificatePinnerIsServerTrustedResult: false, credentialResult: nil, result: .cancelAuthenticationChallenge) - static let whenChallengeIsValidAndServerIsTrustedExpectValidResults = TestMetadata(challenge: Stubs.CertificatePinner.fakeChallenge(with: Stubs.CertificatePinner.certificate), + static let whenChallengeIsValidAndServerIsTrustedExpectValid = TestMetadata(challenge: Stubs.CertificatePinner.fakeChallenge(with: Stubs.CertificatePinner.certificate), certificatePinnerIsServerTrustedResult: true, credentialResult: URLCredential(trust: Stubs.CertificatePinner.fakeChallenge(with: Stubs.CertificatePinner.certificate).protectionSpace.serverTrust!), result: .useCredential) } - @Test(arguments: [TestCases.whenChallengeIsNilExpectInvalidResults, - TestCases.whenChallengeIsValidAndServerIsNotTrustedExpectInvalidResults, - TestCases.whenChallengeIsValidAndServerIsTrustedExpectValidResults]) + @Test(arguments: [TestCases.whenChallengeIsNilExpectInvalid, + TestCases.whenChallengeIsValidAndServerIsNotTrustedExpectInvalid, + TestCases.whenChallengeIsValidAndServerIsTrustedExpectValid]) func urlSessionTests(metadata: TestMetadata) async { await confirmation("") { confirmation in let (sut, mock) = sut()