Merge master into main

2026-09-13 20:23:35 +02:00
parent 18d7d56345 dce0880576
commit bbf5f191f2
7 changed files with 112 additions and 0 deletions
@@ -4,18 +4,28 @@ import XCTest
 final class AppConfigurationTests: XCTestCase {
    func testDevelopmentConfigurationReadsKnownEnvironmentKeys() {
        let configuration = AppConfiguration.development(environment: [
+<<<<<<< HEAD
            "MUSIC_ASSISTANT_OPENAI_API_KEY": "openai-test-key",
            "MUSIC_ASSISTANT_PRIVATE_AI_RULES": "  private product rules  "
        ])

        XCTAssertEqual(configuration.openAIAPIKey, "openai-test-key")
        XCTAssertEqual(configuration.privateApplicationRules?.content, "private product rules")
+=======
+            "MUSIC_ASSISTANT_OPENAI_API_KEY": "openai-test-key"
+        ])
+
+        XCTAssertEqual(configuration.openAIAPIKey, "openai-test-key")
+>>>>>>> origin/master
    }

    func testDevelopmentConfigurationAllowsMissingSecrets() {
        let configuration = AppConfiguration.development(environment: [:])

        XCTAssertNil(configuration.openAIAPIKey)
+<<<<<<< HEAD
        XCTAssertNil(configuration.privateApplicationRules)
+=======
+>>>>>>> origin/master
    }
 }