fix Test

Author: zunda-pixel

Tests/FunctionsTests/FunctionInvokeOptionsTests.swift

@@ -5,13 +5,13 @@ import XCTest
 final class FunctionInvokeOptionsTests: XCTestCase {
   func test_initWithStringBody() {
     let options = FunctionInvokeOptions(body: "string value")
-    XCTAssertEqual(options.headers["Content-Type"], "text/plain")
+    XCTAssertEqual(options.headers[.contentType], "text/plain")
     XCTAssertNotNil(options.body)
   }
 
   func test_initWithDataBody() {
     let options = FunctionInvokeOptions(body: "binary value".data(using: .utf8)!)
-    XCTAssertEqual(options.headers["Content-Type"], "application/octet-stream")
+    XCTAssertEqual(options.headers[.contentType], "application/octet-stream")
     XCTAssertNotNil(options.body)
   }
 
@@ -20,7 +20,7 @@ final class FunctionInvokeOptionsTests: XCTestCase {
       let value: String
     }
     let options = FunctionInvokeOptions(body: Body(value: "value"))
-    XCTAssertEqual(options.headers["Content-Type"], "application/json")
+    XCTAssertEqual(options.headers[.contentType], "application/json")
     XCTAssertNotNil(options.body)
   }
 
@@ -31,7 +31,7 @@ final class FunctionInvokeOptionsTests: XCTestCase {
       headers: ["Content-Type": contentType],
       body: "binary value".data(using: .utf8)!
     )
-    XCTAssertEqual(options.headers["Content-Type"], contentType)
+    XCTAssertEqual(options.headers[.contentType], contentType)
     XCTAssertNotNil(options.body)
   }
 }

Tests/FunctionsTests/FunctionsClientTests.swift

@@ -1,6 +1,7 @@
 import ConcurrencyExtras
 @testable import Functions
 import Helpers
+import HTTPTypes
 import TestHelpers
 import XCTest
 
@@ -22,8 +23,8 @@ final class FunctionsClientTests: XCTestCase {
     )
     XCTAssertEqual(client.region, "sa-east-1")
 
-    XCTAssertEqual(client.headers["Apikey"], apiKey)
-    XCTAssertNotNil(client.headers["X-Client-Info"])
+    XCTAssertEqual(client.headers[.init("Apikey")!], apiKey)
+    XCTAssertNotNil(client.headers[.init("X-Client-Info")!])
   }
 
   func testInvoke() async throws {
@@ -53,9 +54,9 @@ final class FunctionsClientTests: XCTestCase {
 
     XCTAssertEqual(request?.url, url)
     XCTAssertEqual(request?.method, .post)
-    XCTAssertEqual(request?.headers["Apikey"], apiKey)
-    XCTAssertEqual(request?.headers["X-Custom-Key"], "value")
-    XCTAssertEqual(request?.headers["X-Client-Info"], "functions-swift/\(Functions.version)")
+    XCTAssertEqual(request?.headers[.init("Apikey")!], apiKey)
+    XCTAssertEqual(request?.headers[.init("X-Custom-Key")!], "value")
+    XCTAssertEqual(request?.headers[.init("X-Client-Info")!], "functions-swift/\(Functions.version)")
   }
 
   func testInvokeWithCustomMethod() async throws {
@@ -109,7 +110,7 @@ final class FunctionsClientTests: XCTestCase {
     try await sut.invoke("hello-world")
 
     let request = await http.receivedRequests.last
-    XCTAssertEqual(request?.headers["x-region"], "ca-central-1")
+    XCTAssertEqual(request?.headers[.xRegion], "ca-central-1")
   }
 
   func testInvokeWithRegion() async throws {
@@ -126,7 +127,7 @@ final class FunctionsClientTests: XCTestCase {
     try await sut.invoke("hello-world", options: .init(region: .caCentral1))
 
     let request = await http.receivedRequests.last
-    XCTAssertEqual(request?.headers["x-region"], "ca-central-1")
+    XCTAssertEqual(request?.headers[.xRegion], "ca-central-1")
   }
 
   func testInvokeWithoutRegion() async throws {
@@ -143,7 +144,7 @@ final class FunctionsClientTests: XCTestCase {
     try await sut.invoke("hello-world")
 
     let request = await http.receivedRequests.last
-    XCTAssertNil(request?.headers["x-region"])
+    XCTAssertNil(request?.headers[.xRegion])
   }
 
   func testInvoke_shouldThrow_URLError_badServerResponse() async {
@@ -190,7 +191,7 @@ final class FunctionsClientTests: XCTestCase {
       http: HTTPClientMock().any { _ in
         try .stub(
           body: Empty(),
-          headers: ["x-relay-error": "true"]
+          headers: [.xRelayError: "true"]
         )
       }
     )
@@ -206,16 +207,16 @@ final class FunctionsClientTests: XCTestCase {
 
   func test_setAuth() {
     sut.setAuth(token: "access.token")
-    XCTAssertEqual(sut.headers["Authorization"], "Bearer access.token")
+    XCTAssertEqual(sut.headers[.authorization], "Bearer access.token")
   }
 }
 
-extension HTTPResponse {
+extension Helpers.HTTPResponse {
   static func stub(
     body: any Encodable,
     statusCode: Int = 200,
-    headers: HTTPHeaders = .init()
-  ) throws -> HTTPResponse {
+    headers: HTTPFields = .init()
+  ) throws -> Helpers.HTTPResponse {
     let data = try JSONEncoder().encode(body)
     let response = HTTPURLResponse(
       url: URL(string: "http://127.0.0.1")!,

Tests/HelpersTests/HTTPHeadersTests.swift

@@ -13,11 +13,11 @@ final class PostgrestBuilderTests: XCTestCase {
 
   func testCustomHeaderOnAPerCallBasis() throws {
     let postgrest1 = PostgrestClient(url: url, headers: ["apikey": "foo"], logger: nil)
-    let postgrest2 = try postgrest1.rpc("void_func").setHeader(name: "apikey", value: "bar")
+    let postgrest2 = try postgrest1.rpc("void_func").setHeader(name: .init("apikey")!, value: "bar")
 
     // Original client object isn't affected
-    XCTAssertEqual(postgrest1.from("users").select().mutableState.request.headers["apikey"], "foo")
+    XCTAssertEqual(postgrest1.from("users").select().mutableState.request.headers[.init("apikey")!], "foo")
     // Derived client object uses new header value
-    XCTAssertEqual(postgrest2.mutableState.request.headers["apikey"], "bar")
+    XCTAssertEqual(postgrest2.mutableState.request.headers[.init("apikey")!], "bar")
   }
 }

Tests/PostgRESTTests/PostgrestBuilderTests.swift

@@ -265,9 +265,9 @@ final class RealtimeTests: XCTestCase {
     expectNoDifference(
       request?.headers,
       [
-        "content-type": "application/json",
-        "apikey": "anon.api.key",
-        "authorization": "Bearer anon.api.key",
+        .contentType: "application/json",
+        .apiKey: "anon.api.key",
+        .authorization: "Bearer anon.api.key",
       ]
     )
 

Tests/RealtimeTests/RealtimeTests.swift

@@ -78,7 +78,9 @@ final class SupabaseClientTests: XCTestCase {
     XCTAssertEqual(realtimeURL.absoluteString, "https://project-ref.supabase.co/realtime/v1")
 
     let realtimeOptions = client.realtimeV2.options
-    let expectedRealtimeHeader = client._headers.merged(with: ["custom_realtime_header_key": "custom_realtime_header_value"])
+    let expectedRealtimeHeader = client._headers.merging(with: [
+      .init("custom_realtime_header_key")!: "custom_realtime_header_value"]
+    )
     expectNoDifference(realtimeOptions.headers, expectedRealtimeHeader)
     XCTAssertIdentical(realtimeOptions.logger as? Logger, logger)