From 76d96b35074ed2f1e6f9b1272078d6fb597ee27a Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Wed, 2 Nov 2022 21:02:18 +0100 Subject: [PATCH] =?UTF-8?q?=E2=9C=85=20Fix=20issue=20with=20UI=20tests=20a?= =?UTF-8?q?nd=20.localizable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PHP Monitor.xcodeproj/project.pbxproj | 8 +++---- .../Common/Extensions/StringExtension.swift | 22 ++++++++++++++----- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/PHP Monitor.xcodeproj/project.pbxproj b/PHP Monitor.xcodeproj/project.pbxproj index 517f643..2531ea8 100644 --- a/PHP Monitor.xcodeproj/project.pbxproj +++ b/PHP Monitor.xcodeproj/project.pbxproj @@ -2890,7 +2890,7 @@ CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 8M54J5J787; GENERATE_INFOPLIST_FILE = YES; - MACOSX_DEPLOYMENT_TARGET = 12.3; + MACOSX_DEPLOYMENT_TARGET = 11.0; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = "com.nicoverbruggen.phpmon.ui-tests"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -2908,7 +2908,7 @@ CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 8M54J5J787; GENERATE_INFOPLIST_FILE = YES; - MACOSX_DEPLOYMENT_TARGET = 12.3; + MACOSX_DEPLOYMENT_TARGET = 11.0; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = "com.nicoverbruggen.phpmon.ui-tests"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -2926,7 +2926,7 @@ CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 8M54J5J787; GENERATE_INFOPLIST_FILE = YES; - MACOSX_DEPLOYMENT_TARGET = 12.3; + MACOSX_DEPLOYMENT_TARGET = 11.0; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = "com.nicoverbruggen.phpmon.ui-tests"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -2944,7 +2944,7 @@ CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 8M54J5J787; GENERATE_INFOPLIST_FILE = YES; - MACOSX_DEPLOYMENT_TARGET = 12.3; + MACOSX_DEPLOYMENT_TARGET = 11.0; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = "com.nicoverbruggen.phpmon.ui-tests"; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/phpmon/Common/Extensions/StringExtension.swift b/phpmon/Common/Extensions/StringExtension.swift index 5af4bf2..38ac652 100644 --- a/phpmon/Common/Extensions/StringExtension.swift +++ b/phpmon/Common/Extensions/StringExtension.swift @@ -9,12 +9,24 @@ import SwiftUI struct Localization { static var bundle: Bundle = { - var bundle = Bundle.main - if isRunningTests { - bundle = Bundle(identifier: "com.nicoverbruggen.phpmon.dev") - ?? Bundle(identifier: "com.nicoverbruggen.phpmon")! + if !isRunningTests { + return Bundle.main } - return bundle + + let foundBundle = Bundle(identifier: "com.nicoverbruggen.phpmon.dev") + ?? Bundle(identifier: "com.nicoverbruggen.phpmon") + ?? Bundle(identifier: "com.nicoverbruggen.phpmon.ui-tests") + + if foundBundle == nil { + let bundles = Bundle.allBundles + .map { $0.bundleIdentifier } + .filter { $0 != nil } + .map { $0! } + + fatalError("The following bundles were found: \(bundles)") + } + + return foundBundle! }() }