✅ Fix tests, cleanup

PHP Monitor.xcodeproj/project.pbxproj

@@ -3850,7 +3850,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1590;
+				CURRENT_PROJECT_VERSION = 1595;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG = YES;
 				ENABLE_APP_SANDBOX = NO;
@@ -3881,7 +3881,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1590;
+				CURRENT_PROJECT_VERSION = 1595;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG = NO;
 				ENABLE_APP_SANDBOX = NO;
@@ -4115,7 +4115,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1590;
+				CURRENT_PROJECT_VERSION = 1595;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG = NO;
 				ENABLE_APP_SANDBOX = NO;
@@ -4232,7 +4232,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1590;
+				CURRENT_PROJECT_VERSION = 1595;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG = YES;
 				ENABLE_APP_SANDBOX = NO;
@@ -4349,7 +4349,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1590;
+				CURRENT_PROJECT_VERSION = 1595;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG = YES;
 				ENABLE_APP_SANDBOX = NO;
@@ -4529,7 +4529,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1590;
+				CURRENT_PROJECT_VERSION = 1595;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG = NO;
 				ENABLE_APP_SANDBOX = NO;

phpmon/Domain/Presets/Preset.swift

@@ -172,7 +172,6 @@ struct Preset: Codable, Equatable {
 
     // MARK: - Menu Items
 
-    // swiftlint:disable void_function_in_ternary
     public func getMenuItemText() -> String {
         var info = extensions.count == 1
             ? "preset.extension".localized(extensions.count)
@@ -197,7 +196,6 @@ struct Preset: Codable, Equatable {
         + info + "</i>"
         + "</span>"
     }
-    // swiftlint:enable void_function_in_ternary
 
     // MARK: - Reverting
 

tests/Shared/TestableConfigurations.swift

@@ -138,7 +138,14 @@ class TestableConfigurations {
                     : .instant(ShellStrings.shared.brewServicesAsRoot),
                 "/opt/homebrew/bin/brew services info --all --json"
                     : .instant(ShellStrings.shared.brewServicesAsUser),
-                "curl -s --max-time 10 '\(Constants.Urls.DevBuildCaskFile.absoluteString)'"
+                """
+                    curl -s --max-time 10 \
+                    -H "User-Agent: phpmon \(App.shortVersion)" \
+                    -H "X-phpmon-version: \(App.bundleVersion)" \
+                    -H "X-phpmon-os-version: \(App.macVersion)" \
+                    -H "X-phpmon-bundle-id: \(App.identifier)" \
+                    '\(Constants.Urls.UpdateCheckEndpoint.absoluteString)'
+                """
                     : .delayed(0.5, """
                 cask 'phpmon-dev' do
                     depends_on formula: 'gnu-sed'

tests/ui/UpdateCheckTest.swift

@@ -32,7 +32,14 @@ final class UpdateCheckTest: UITestCase {
 
         // Ensure an update is available
         configuration.shellOutput[
-            "curl -s --max-time 10 '\(Constants.Urls.DevBuildCaskFile.absoluteString)'"
+            """
+                curl -s --max-time 10 \
+                -H "User-Agent: phpmon \(App.shortVersion)" \
+                -H "X-phpmon-version: \(App.bundleVersion)" \
+                -H "X-phpmon-os-version: \(App.macVersion)" \
+                -H "X-phpmon-bundle-id: \(App.identifier)" \
+                '\(Constants.Urls.UpdateCheckEndpoint.absoluteString)'
+            """
         ] = .delayed(0.5, """
             cask 'phpmon-dev' do
                 depends_on formula: 'gnu-sed'
@@ -64,7 +71,14 @@ final class UpdateCheckTest: UITestCase {
 
         // Ensure an update is available
         configuration.shellOutput[
-            "curl -s --max-time 10 '\(Constants.Urls.DevBuildCaskFile.absoluteString)'"
+            """
+                curl -s --max-time 10 \
+                -H "User-Agent: phpmon \(App.shortVersion)" \
+                -H "X-phpmon-version: \(App.bundleVersion)" \
+                -H "X-phpmon-os-version: \(App.macVersion)" \
+                -H "X-phpmon-bundle-id: \(App.identifier)" \
+                '\(Constants.Urls.UpdateCheckEndpoint.absoluteString)'
+            """
         ] = .delayed(0.5, """
             cask 'phpmon-dev' do
                 depends_on formula: 'gnu-sed'
@@ -104,7 +118,14 @@ final class UpdateCheckTest: UITestCase {
 
         // Ensure an update is available
         configuration.shellOutput[
-            "curl -s --max-time 10 '\(Constants.Urls.DevBuildCaskFile.absoluteString)'"
+            """
+                curl -s --max-time 10 \
+                -H "User-Agent: phpmon \(App.shortVersion)" \
+                -H "X-phpmon-version: \(App.bundleVersion)" \
+                -H "X-phpmon-os-version: \(App.macVersion)" \
+                -H "X-phpmon-bundle-id: \(App.identifier)" \
+                '\(Constants.Urls.UpdateCheckEndpoint.absoluteString)'
+            """
         ] = .delayed(0.5, "404 PAGE NOT FOUND")
 
         // Wait for the menu to open and search for updates

tests/unit/Parsers/CaskFileParserTest.swift

@@ -40,7 +40,9 @@ class CaskFileParserTest: XCTestCase {
     }
 
     func test_can_extract_fields_from_remote_cask_file() async throws {
-        guard let caskFile = await CaskFile.from(url: Constants.Urls.StableBuildCaskFile) else {
+        let url = URL(string: "https://raw.githubusercontent.com/nicoverbruggen/homebrew-cask/master/Casks/phpmon.rb")!
+
+        guard let caskFile = await CaskFile.from(url: url) else {
             return XCTFail("The remote CaskFile could not be parsed, check the log for more info")
         }