Fix patterns for associated values

dhardiman · Jul 3, 2019 · 880ef2b · 880ef2b
1 parent da04441
commit 880ef2b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/Sources/Config/ConfigurationProperty.swift b/Sources/Config/ConfigurationProperty.swift
@@ -120,7 +120,7 @@ struct ConfigurationProperty<T>: Property, AssociatedPropertyKeyProviding {
     }
 
     func keyValue(for scheme: String) -> String {
-        let overrideValue = overrides.first(where: { scheme.range(of: $0.key, options: .regularExpression) != nil })?.value ?? defaultValue
+        let overrideValue = overrides.first(where: { scheme.range(of: pattern(for: $0.key), options: .regularExpression) != nil })?.value ?? defaultValue
         guard let value = overrideValue as? String else {
             fatalError("Cannot retrieve keyValue for type \(T.self). Type must be String.")
         }

diff --git a/Tests/ConfigTests/ConfigurationFileTests.swift b/Tests/ConfigTests/ConfigurationFileTests.swift
@@ -322,6 +322,8 @@ class ConfigurationFileTests: XCTestCase {
 
         // swiftlint:disable force_unwrapping type_body_length file_length superfluous_disable_command
         public enum Test {
+            public static let associatedProperty: String = #"correct"#
+
             public static let propertyNotUsingPattern: String = #"test value"#
 
             public static let propertyUsingPattern: String = #"test value"#
@@ -515,5 +517,13 @@ private let configurationWithCommonPatterns: [String: Any] = [
         "overrides": [
             "(PROD|STAGING)": "test value"
         ]
+    ],
+    "associatedProperty": [
+        "type": "String",
+        "associatedProperty": "propertyUsingPattern",
+        "defaultValue": "wrong",
+        "overrides": [
+            "test value": "correct"
+        ]
     ]
 ]