Do not use Bundle main in tests

Author: buggmagnet

ios/MullvadVPN/GeneralAPIs/OutgoingConnectionProxy.swift

@@ -20,15 +20,17 @@ final class OutgoingConnectionProxy: OutgoingConnectionHandling {
     enum ExitIPVersion: String {
         case v4 = "ipv4", v6 = "ipv6"
 
-        var host: String {
-            "\(rawValue).am.i.\(ApplicationConfiguration.hostName)"
+        func host(hostname: String) -> String {
+            "\(rawValue).am.i.\(hostname)"
         }
     }
 
     let urlSession: URLSessionProtocol
+    let hostname: String
 
-    init(urlSession: URLSessionProtocol) {
+    init(urlSession: URLSessionProtocol, hostname: String) {
         self.urlSession = urlSession
+        self.hostname = hostname
     }
 
     func getIPV6(retryStrategy: REST.RetryStrategy) async throws -> IPV6ConnectionData {
@@ -43,7 +45,7 @@ final class OutgoingConnectionProxy: OutgoingConnectionHandling {
         let delayIterator = retryStrategy.makeDelayIterator()
         for _ in 0 ..< retryStrategy.maxRetryCount {
             do {
-                return try await perform(host: version.host)
+                return try await perform(host: version.host(hostname: hostname))
             } catch {
                 // ignore if request is cancelled
                 if case URLError.cancelled = error {
@@ -57,7 +59,7 @@ final class OutgoingConnectionProxy: OutgoingConnectionHandling {
                 }
             }
         }
-        return try await perform(host: version.host)
+        return try await perform(host: version.host(hostname: hostname))
     }
 
     private func perform<T: Decodable>(host: String) async throws -> T {

ios/MullvadVPN/SceneDelegate.swift

@@ -73,7 +73,10 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate, SettingsMigrationUIHand
             devicesProxy: appDelegate.devicesProxy,
             accountsProxy: appDelegate.accountsProxy,
             outgoingConnectionService: OutgoingConnectionService(
-                outgoingConnectionProxy: OutgoingConnectionProxy(urlSession: URLSession(configuration: .ephemeral))
+                outgoingConnectionProxy: OutgoingConnectionProxy(
+                    urlSession: URLSession(configuration: .ephemeral),
+                    hostname: ApplicationConfiguration.hostName
+                )
             ),
             appPreferences: AppPreferences(),
             accessMethodRepository: accessMethodRepository,

ios/MullvadVPNTests/MullvadVPN/GeneralAPIs/OutgoingConnectionProxyTests.swift

@@ -11,6 +11,7 @@ import XCTest
 final class OutgoingConnectionProxyTests: XCTestCase {
     private var mockIPV6ConnectionData: Data!
     private var mockIPV4ConnectionData: Data!
+    private let hostname = "mullvad.net"
 
     private let encoder = JSONEncoder()
 
@@ -29,7 +30,7 @@ final class OutgoingConnectionProxyTests: XCTestCase {
 
         let outgoingConnectionProxy = OutgoingConnectionProxy(urlSession: URLSessionStub(
             response: (mockIPV4ConnectionData, createHTTPURLResponse(ip: .v4, statusCode: 200))
-        ))
+        ), hostname: hostname)
 
         let result = try await outgoingConnectionProxy.getIPV4(retryStrategy: .noRetry)
 
@@ -44,7 +45,7 @@ final class OutgoingConnectionProxyTests: XCTestCase {
 
         let outgoingConnectionProxy = OutgoingConnectionProxy(urlSession: URLSessionStub(
             response: (Data(), createHTTPURLResponse(ip: .v4, statusCode: 503))
-        ))
+        ), hostname: hostname)
 
         await XCTAssertThrowsErrorAsync(try await outgoingConnectionProxy.getIPV4(retryStrategy: .noRetry)) { _ in
             noIPv4Expectation.fulfill()
@@ -57,7 +58,7 @@ final class OutgoingConnectionProxyTests: XCTestCase {
 
         let outgoingConnectionProxy = OutgoingConnectionProxy(urlSession: URLSessionStub(
             response: (mockIPV6ConnectionData, createHTTPURLResponse(ip: .v6, statusCode: 200))
-        ))
+        ), hostname: hostname)
 
         let result = try await outgoingConnectionProxy.getIPV6(retryStrategy: .noRetry)
 
@@ -72,7 +73,7 @@ final class OutgoingConnectionProxyTests: XCTestCase {
 
         let outgoingConnectionProxy = OutgoingConnectionProxy(urlSession: URLSessionStub(
             response: (mockIPV6ConnectionData, createHTTPURLResponse(ip: .v6, statusCode: 404))
-        ))
+        ), hostname: hostname)
 
         await XCTAssertThrowsErrorAsync(try await outgoingConnectionProxy.getIPV6(retryStrategy: .noRetry)) { _ in
             noIPv6Expectation.fulfill()
@@ -84,7 +85,7 @@ final class OutgoingConnectionProxyTests: XCTestCase {
 extension OutgoingConnectionProxyTests {
     private func createHTTPURLResponse(ip: OutgoingConnectionProxy.ExitIPVersion, statusCode: Int) -> HTTPURLResponse {
         return HTTPURLResponse(
-            url: URL(string: "https://\(ip.host)/json")!,
+            url: URL(string: "https://\(ip.host(hostname: hostname))/json")!,
             statusCode: statusCode,
             httpVersion: nil,
             headerFields: ["Content-Type": "application/json"]

ios/Shared/ApplicationConfiguration.swift

@@ -9,14 +9,15 @@
 import Foundation
 import Network
 
-// swiftlint:disable force_cast
 enum ApplicationConfiguration {
     static var hostName: String {
+        // swiftlint:disable:next force_cast
         Bundle.main.object(forInfoDictionaryKey: "HostName") as! String
     }
 
     /// Shared container security group identifier.
     static var securityGroupIdentifier: String {
+        // swiftlint:disable:next force_cast
         Bundle.main.object(forInfoDictionaryKey: "ApplicationSecurityGroupIdentifier") as! String
     }
 
@@ -74,5 +75,3 @@ enum ApplicationConfiguration {
     /// Maximum number of devices per account.
     static let maxAllowedDevices = 5
 }
-
-// swiftlint:enable force_cast