Introduce initial GitHub Action for unit testing (#82)

okta · Nov 4, 2021 · a63482f · a63482f
1 parent 50aeee5
commit a63482f
Show file tree

Hide file tree

Showing 7 changed files with 83 additions and 75 deletions.
diff --git a/.github/workflows/okta-idx.yaml b/.github/workflows/okta-idx.yaml
@@ -0,0 +1,30 @@
+name: OktaIdx
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  UnitTests:
+    runs-on: macos-11
+    strategy:
+      matrix:
+        xcode: [ "13.1", "12.4" ]
+    env:
+      DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
+    steps:
+    - uses: actions/checkout@v2
+    - name: Xcode iOS Unit Tests
+      run: xcodebuild -workspace okta-idx.xcworkspace -scheme "okta-idx-ios" -destination "platform=iOS Simulator,OS=latest,name=iPhone 11" clean test
+    - name: Swift Tests
+      run: swift test -v
+  PackageValidation:
+    runs-on: macos-11
+    env:
+      DEVELOPER_DIR: /Applications/Xcode_13.1.app/Contents/Developer
+    steps:
+    - uses: actions/checkout@v2
+    - name: Cocoapods
+      run: pod lib lint
diff --git a/.travis.yml b/.travis.yml
diff --git a/Sources/OktaIdx/Internal/Implementations/Version1/Extensions/PKCEExtensions.swift b/Sources/OktaIdx/Internal/Implementations/Version1/Extensions/PKCEExtensions.swift
@@ -21,17 +21,26 @@ internal extension Data {
     /// Produces a SHA256 hash of the supplied data.
     /// - Returns: SHA256 representation of the data.
     func sha256() -> Data {
+        #if canImport(CryptoKit)
         if #available(iOS 13.0, macCatalyst 13.0, macOS 10.15, tvOS 13.0, watchOS 6.0, *) {
             return Data(SHA256.hash(data: self))
         } else {
-            var hash = [UInt8](repeating: 0, count: Int(CC_SHA256_DIGEST_LENGTH))
-            self.withUnsafeBytes {
-                _ = CC_SHA256($0.baseAddress, CC_LONG(self.count), &hash)
-            }
-            return Data(hash)
+            return commonCryptoSHA256()
         }
+        #else
+        return commonCryptoSHA256()
+        #endif
     }
 
+    private func commonCryptoSHA256() -> Data {
+        var hash = [UInt8](repeating: 0, count: Int(CC_SHA256_DIGEST_LENGTH))
+        self.withUnsafeBytes {
+            _ = CC_SHA256($0.baseAddress, CC_LONG(self.count), &hash)
+        }
+        return Data(hash)
+    }
+
+
     /// Encodes the data as a URL-safe Base64 string.
     /// - Returns: Base64 URL-encoded string.
     func base64URLEncodedString() -> String {

diff --git a/Sources/OktaIdx/Internal/Utilities/DebugDescription.swift b/Sources/OktaIdx/Internal/Utilities/DebugDescription.swift
@@ -61,8 +61,8 @@ struct DebugDescription<T: Any> {
 extension String {
     func indentingNewlines(by spaceCount: Int) -> String {
         let spaces = String(repeating: " ", count: spaceCount)
-        let components = components(separatedBy: "\n")
+        let items = components(separatedBy: "\n")
 
-        return String(components.map { "\n" + spaces + $0 }.joined().dropFirst())
+        return String(items.map { "\n" + spaces + $0 }.joined().dropFirst())
     }
 }
diff --git a/Tests/OktaIdxTests/IDXClientDelegateTests.swift b/Tests/OktaIdxTests/IDXClientDelegateTests.swift
@@ -50,20 +50,21 @@ class IDXClientDelegateTests: XCTestCase {
         client = IDXClient(context: context, api: api)
         client.delegate = delegate
 
-        remediationOption = .init(client: client,
-                                  name: "cancel",
-                                  method: "GET",
-                                  href: URL(string: "some://url")!,
-                                  accepts: "application/json",
-                                  form: IDXClient.Remediation.Form(fields: [
-                                    IDXClient.Remediation.Form.Field(name: "foo",
-                                                                     visible: false,
-                                                                     mutable: true,
-                                                                     required: false,
-                                                                     secret: false)
-                                  ])!,
-                                  refresh: nil,
-                                  relatesTo: nil)
+        remediationOption = IDXClient.Remediation(
+            client: client,
+            name: "cancel",
+            method: "GET",
+            href: URL(string: "some://url")!,
+            accepts: "application/json",
+            form: IDXClient.Remediation.Form(fields: [
+                IDXClient.Remediation.Form.Field(name: "foo",
+                                                 visible: false,
+                                                 mutable: true,
+                                                 required: false,
+                                                 secret: false)
+            ])!,
+            refresh: nil,
+            relatesTo: nil)
         token = IDXClient.Token(accessToken: "access",
                                 refreshToken: "refresh",
                                 expiresIn: 10,

diff --git a/Tests/TestCommon/Mocks/IDXClientAPIMock.swift b/Tests/TestCommon/Mocks/IDXClientAPIMock.swift
@@ -34,12 +34,12 @@ class MockBase {
     }
 
     func result<T>(for name: String) -> Result<T, IDXClientError> {
-        let response = response(for: name)
-        if let result = response?["response"] as? T {
+        let responseData = response(for: name)
+        if let result = responseData?["response"] as? T {
             return .success(result)
         }
 
-        let error = response?["error"] as? IDXClientError ?? IDXClientError.invalidClient
+        let error = responseData?["error"] as? IDXClientError ?? IDXClientError.invalidClient
         return .failure(error)
     }
 }
@@ -54,35 +54,31 @@ class IDXClientAPIMock: MockBase, IDXClientAPI {
     func resume(completion: IDXClient.ResponseResult?) {
         recordedCalls.append(RecordedCall(function: #function,
                                           arguments: [:]))
-        let result: Result<IDXClient.Response, IDXClientError> = result(for: #function)
-        completion?(result)
+        completion?(result(for: #function))
     }
 
     func proceed(remediation option: IDXClient.Remediation, completion: IDXClient.ResponseResult?) {
         recordedCalls.append(RecordedCall(function: #function,
                                           arguments: [
                                             "remediation": option as Any,
                                           ]))
-        let result: Result<IDXClient.Response, IDXClientError> = result(for: #function)
-        completion?(result)
+        completion?(result(for: #function))
     }
 
     func exchangeCode(redirect url: URL, completion: IDXClient.TokenResult?) {
         recordedCalls.append(RecordedCall(function: #function,
                                           arguments: [
                                             "redirect": url as Any
                                           ]))
-        let result: Result<IDXClient.Token, IDXClientError> = result(for: #function)
-        completion?(result)
+        completion?(result(for: #function))
     }
 
     func exchangeCode(using remediation: IDXClient.Remediation, completion: IDXClient.TokenResult?) {
         recordedCalls.append(RecordedCall(function: #function,
                                           arguments: [
                                             "using": response as Any
                                           ]))
-        let result: Result<IDXClient.Token, IDXClientError> = result(for: #function)
-        completion?(result)
+        completion?(result(for: #function))
     }
 
     func redirectResult(for url: URL) -> IDXClient.RedirectResult {
@@ -109,23 +105,20 @@ class IDXClientAPIv1Mock: MockBase, IDXClientAPIImpl {
                                           arguments: [
                                             "state": state as Any
                                           ]))
-        let result: Result<IDXClient.Context, IDXClientError> = result(for: #function)
-        completion(result)
+        completion(result(for: #function))
     }
 
     func resume(completion: @escaping (Result<IDXClient.Response, IDXClientError>) -> Void) {
         recordedCalls.append(RecordedCall(function: #function, arguments: nil))
-        let result: Result<IDXClient.Response, IDXClientError> = result(for: #function)
-        completion(result)
+        completion(result(for: #function))
     }
 
     func proceed(remediation option: IDXClient.Remediation, completion: @escaping (Result<IDXClient.Response, IDXClientError>) -> Void) {
         recordedCalls.append(RecordedCall(function: #function,
                                           arguments: [
                                             "remediation": option as Any,
                                           ]))
-        let result: Result<IDXClient.Response, IDXClientError> = result(for: #function)
-        completion(result)
+        completion(result(for: #function))
     }
 
     func redirectResult(for url: URL) -> IDXClient.RedirectResult {
@@ -142,17 +135,15 @@ class IDXClientAPIv1Mock: MockBase, IDXClientAPIImpl {
                                           arguments: [
                                             "redirect": url as Any
                                           ]))
-        let result: Result<IDXClient.Token, IDXClientError> = result(for: #function)
-        completion(result)
+        completion(result(for: #function))
     }
 
     func exchangeCode(using remediation: IDXClient.Remediation, completion: @escaping (Result<IDXClient.Token, IDXClientError>) -> Void) {
         recordedCalls.append(RecordedCall(function: #function,
                                           arguments: [
                                             "using": remediation as Any
                                           ]))
-        let result: Result<IDXClient.Token, IDXClientError> = result(for: #function)
-        completion(result)
+        completion(result(for: #function))
     }
 
     func revoke(token: String, type: String, completion: @escaping (Result<Void, IDXClientError>) -> Void) {
@@ -161,16 +152,14 @@ class IDXClientAPIv1Mock: MockBase, IDXClientAPIImpl {
                                             "token": token as Any,
                                             "type": type as Any
                                           ]))
-        let result: Result<Void, IDXClientError> = result(for: #function)
-        completion(result)
+        completion(result(for: #function))
     }
 
     func refresh(token: IDXClient.Token, completion: @escaping (Result<IDXClient.Token, IDXClientError>) -> Void) {
         recordedCalls.append(RecordedCall(function: #function,
                                           arguments: [
                                             "token": token as Any
                                           ]))
-        let result: Result<IDXClient.Token, IDXClientError> = result(for: #function)
-        completion(result)
+        completion(result(for: #function))
     }
 }
diff --git a/Tests/TestCommon/Utilities/Bundle+Extensions.swift b/Tests/TestCommon/Utilities/Bundle+Extensions.swift
@@ -31,7 +31,14 @@ extension Bundle {
     }
 
     static func testResource(folderName: String? = nil, fileName: String) -> URL {
-        var path = resourcesPath.appendingPathComponent("Resources")
+        var path = resourcesPath
+
+        // Handle differences when run in macOS targets.
+        if FileManager.default.fileExists(atPath: "\(path.path)/Contents/Resources") {
+            path.appendPathComponent("Contents/Resources")
+        }
+
+        path.appendPathComponent("Resources")
         if let folderName = folderName {
             path.appendPathComponent(folderName)
         }