Merge pull request #23 from joselinoneto/22-fix-tests

fixing tests

.github/workflows/swift.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   build:
 
-    runs-on: macos-latest
+    runs-on: macos-12
 
     steps:
     - uses: actions/checkout@v2

.swiftpm/xcode/xcshareddata/xcschemes/ToolboxAPIClientTests.xcscheme

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1340"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "ToolboxAPIClientTests"
+               BuildableName = "ToolboxAPIClientTests"
+               BlueprintName = "ToolboxAPIClientTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Package.swift

@@ -1,11 +1,11 @@
-// swift-tools-version:5.3
+// swift-tools-version:5.6
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
     name: "ToolboxAPIClient",
-    platforms: [.iOS(.v14), .watchOS(.v7)],
+    platforms: [.macOS(.v12), .iOS(.v15), .watchOS(.v8)],
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.
         .library(

Sources/ToolboxAPIClient/BaseNetworkWorker.swift

@@ -8,7 +8,6 @@
 import Foundation
 import Combine
 
-@available(iOS 15.0, *)
 public class BaseNetworkWorker<T> where T: Codable {
     private var targetType: TargetType
 
@@ -71,7 +70,7 @@ public class BaseNetworkWorker<T> where T: Codable {
             let data = try? jsonEncoder.encode(httpBody)
             urlRequest.httpBody = data
         }
-        
+
         let (data, _) = try await URLSession.shared.data(for: urlRequest)
         let decoder = JSONDecoder()
         return try decoder.decode(T?.self, from: data)

Tests/ToolboxAPIClientTests/Network/Story/Manager/LoginManagerAPI.swift

@@ -10,7 +10,8 @@ import ToolboxAPIClient
 
 public class LoginManagerAPI: LoginRequestable {
     public func login(email: String, password: String) async throws -> LoginDto? {
-        try await BaseNetworkWorker<LoginDto>(target: LoginTarget.login(email: email, password: password)).urlRequest()
+        let login: LoginDto = LoginDto(email: email, password: password, token: nil)
+        return try await BaseNetworkWorker<LoginDto>(target: LoginTarget.login).urlRequest(contentBody: login)
     }
 
     public func createUser(email: String, password: String) async throws -> LoginDto? {
@@ -21,8 +22,4 @@ public class LoginManagerAPI: LoginRequestable {
     public func me() async throws -> UserDto? {
         try await BaseNetworkWorker<UserDto>(target: LoginTarget.me).urlRequest()
     }
-
-    public init() {
-
-    }
 }

Tests/ToolboxAPIClientTests/Network/Story/Targets/LoginTarget.swift

@@ -16,7 +16,7 @@ public protocol LoginRequestable {
 
 public enum LoginTarget {
     case createUser
-    case login(email: String, password: String)
+    case login
     case me
 }
 
@@ -36,7 +36,7 @@ extension LoginTarget: TargetType {
         switch self {
         case .createUser:
             return "create"
-        case .login(_, _):
+        case .login:
             return "login"
         case .me:
             return "me"
@@ -47,14 +47,20 @@ extension LoginTarget: TargetType {
         switch self {
         case .createUser:
             return .post
-        case .login(_, _):
+        case .login:
             return .post
         case .me:
             return .get
         }
     }
-    
+
     public var headers: [String : String]? {
-        nil
+        // Bad pratice! Basic Unit Testing.
+        // Must use Keychain
+        let defaults = UserDefaults.standard
+        if let token = defaults.string(forKey: "token") {
+            return ["Authorization": "Bearer  \(token)"]
+        }
+        return nil
     }
 }