Merge pull request #57 from square/dhaval/workflowAssertActionFix

Fixing RenderTester assert(action:)
square · Aug 25, 2020 · 0b65bcf · 0b65bcf
2 parents cccd720 + 542fd03
commit 0b65bcf
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/Workflow/Sources/AnyWorkflow.swift b/Workflow/Sources/AnyWorkflow.swift
@@ -74,7 +74,7 @@ extension AnyWorkflow {
     /// That type information *is* present in our storage object, however, so we
     /// pass the context down to that storage object which will ultimately call
     /// through to `context.render(workflow:key:reducer:)`.
-    internal func render<Parent>(context: RenderContext<Parent>, key: String, outputMap: @escaping (Output) -> AnyWorkflowAction<Parent>) -> Rendering {
+    internal func render<Parent, Action>(context: RenderContext<Parent>, key: String, outputMap: @escaping (Output) -> Action) -> Rendering where Action: WorkflowAction, Action.WorkflowType == Parent {
         return storage.render(context: context, key: key, outputMap: outputMap)
     }
 }
@@ -84,7 +84,7 @@ extension AnyWorkflow {
     ///
     /// This type is never used directly.
     fileprivate class AnyStorage {
-        func render<Parent>(context: RenderContext<Parent>, key: String, outputMap: @escaping (Output) -> AnyWorkflowAction<Parent>) -> Rendering {
+        func render<Parent, Action>(context: RenderContext<Parent>, key: String, outputMap: @escaping (Output) -> Action) -> Rendering where Action: WorkflowAction, Action.WorkflowType == Parent {
             fatalError()
         }
 
@@ -119,8 +119,8 @@ extension AnyWorkflow {
             return T.self
         }
 
-        override func render<Parent>(context: RenderContext<Parent>, key: String, outputMap: @escaping (Output) -> AnyWorkflowAction<Parent>) -> Rendering {
-            let outputMap: (T.Output) -> AnyWorkflowAction<Parent> = { [outputTransform] output in
+        override func render<Parent, Action>(context: RenderContext<Parent>, key: String, outputMap: @escaping (Output) -> Action) -> Rendering where Action: WorkflowAction, Action.WorkflowType == Parent {
+            let outputMap: (T.Output) -> Action = { [outputTransform] output in
                 outputMap(outputTransform(output))
             }
             let rendering = context.render(workflow: workflow, key: key, outputMap: outputMap)

diff --git a/Workflow/Sources/AnyWorkflowConvertible.swift b/Workflow/Sources/AnyWorkflowConvertible.swift
@@ -38,11 +38,11 @@ extension AnyWorkflowConvertible {
     ///
     /// - Returns: The `Rendering` generated by the workflow.
     public func rendered<Parent>(in context: RenderContext<Parent>, key: String = "") -> Rendering where Output: WorkflowAction, Output.WorkflowType == Parent {
-        return asAnyWorkflow().render(context: context, key: key, outputMap: { AnyWorkflowAction($0) })
+        return asAnyWorkflow().render(context: context, key: key, outputMap: { $0 })
     }
 
     public func rendered<Parent, Action>(in context: RenderContext<Parent>, key: String = "", outputMap: @escaping (Output) -> Action) -> Rendering where Action: WorkflowAction, Action.WorkflowType == Parent {
-        return asAnyWorkflow().render(context: context, key: key, outputMap: { AnyWorkflowAction(outputMap($0)) })
+        return asAnyWorkflow().render(context: context, key: key, outputMap: { outputMap($0) })
     }
 
     public func rendered<Parent>(in context: RenderContext<Parent>, key: String = "") -> Rendering where Output == AnyWorkflowAction<Parent> {

diff --git a/WorkflowTesting/Tests/WorkflowRenderTesterTests.swift b/WorkflowTesting/Tests/WorkflowRenderTesterTests.swift
@@ -98,6 +98,19 @@ final class WorkflowRenderTesterTests: XCTestCase {
             .assertNoAction()
     }
 
+    func test_childWorkflowAction() {
+        ParentWorkflow(initialText: "hello")
+            .renderTester()
+            .expectWorkflow(
+                type: ChildWorkflow.self,
+                producingRendering: "olleh",
+                producingOutput: ChildWorkflow.Output.success
+            )
+            .render { rendering in
+                XCTAssertEqual("olleh", rendering)
+            }.assert(action: ParentWorkflow.Action.childSuccess)
+    }
+
     func test_childWorkflowOutput() {
         // Test that a child emitting an output is handled as an action by the parent
         ParentWorkflow(initialText: "hello")