Support optionals (if without else)

eunikolsky · Jun 19, 2021 · a0dff92 · a0dff92
1 parent cc775cb
commit a0dff92
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 0 deletions.
diff --git a/LightweightValidation/ConjunctionBuilder.swift b/LightweightValidation/ConjunctionBuilder.swift
@@ -16,6 +16,10 @@ public struct ConjunctionBuilder {
             result && validation
         }
     }
+
+    public static func buildOptional <E> (_ validation: V<(), E>?) -> V<(), E> {
+        validation ?? .empty
+    }
 }
 
 public extension V {

diff --git a/LightweightValidationTests/ConjunctionBuilderTests.swift b/LightweightValidationTests/ConjunctionBuilderTests.swift
@@ -32,5 +32,31 @@ class ConjunctionBuilderTests: XCTestCase {
         }
         XCTAssertEqual(sut.error, ["always fails"])
     }
+
+    func testDisabledConditionalStepShouldBeIgnored() {
+        let forceFail = false
+
+        let sut = Response.SimpleValidationResult.all {
+            true <?> StringError("never happens")
+
+            if forceFail {
+                false <?> StringError("always fails")
+            }
+        }
+        XCTAssertTrue(sut.isValue)
+    }
+
+    func testEnabledConditionalStepShouldNotBeIgnored() {
+        let forceFail = true
+
+        let sut = Response.SimpleValidationResult.all {
+            true <?> StringError("never happens")
+
+            if forceFail {
+                false <?> StringError("always fails")
+            }
+        }
+        XCTAssertEqual(sut.error, ["always fails"])
+    }
 }
 #endif