Finished with unit tests

maximkhatskevich · May 9, 2017 · 13aacba · 13aacba
1 parent 003bb31
commit 13aacba
Show file tree

Hide file tree

Showing 3 changed files with 337 additions and 104 deletions.
diff --git a/Src/View/Root/Model/M.Intersection.swift b/Src/View/Root/Model/M.Intersection.swift
@@ -213,7 +213,7 @@ extension M.Intersection
     }
 
     static
-    func toggle() -> Action
+    func toggle(with p: Params = Params.defaults) -> Action
     {
         return trigger { m, next in
 
@@ -230,7 +230,7 @@ extension M.Intersection
                     next{ stop() }
 
                 case is Ready:
-                    next{ start() }
+                    next{ start(with: p) }
 
                 default:
                     break

diff --git a/Tst/Tst.M.Core.swift b/Tst/Tst.M.Core.swift
@@ -11,7 +11,9 @@ import XCTest
 @testable
 import TrafficLights
 
+@testable
 import XCEUniFlow
+
 import XCETesting
 
 //===
@@ -47,30 +49,20 @@ class Tst_M_Core: XCTestCase
 
     func testSetup()
     {
-        let expect = expectation(description: "Core.setup transition")
+        RXC.isNil("M.Core is NOT presented in GlobalModel yet") {
+
+            self.dispatcher.model ==> M.Core.self
+        }
 
         //===
 
-        proxy
-            .submit{ M.Core.setup() }
-
-        proxy
-            .subscribeLater(self)
-            .onUpdate { m in
-
-                RXC.isNotNil("Core IS in Ready state") {
-
-                    m ==> M.Core.Ready.self
-                }
-
-                //===
-
-                self.proxy.unsubscribe(self)
-                expect.fulfill()
-            }
+        self.dispatcher.process(M.Core.setup())
 
         //===
 
-        waitForExpectations(timeout: 3.0)
+        RXC.isNotNil("M.Core IS presented in GlobalModel now") {
+
+            self.dispatcher.model ==> M.Core.self
+        }
     }
 }