Fix #292 runFor

lefthandedgoat · Oct 6, 2016 · d4befdc · d4befdc
1 parent 81ff5c0
commit d4befdc
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 16 deletions.
diff --git a/src/canopy/runner.fs b/src/canopy/runner.fs
@@ -232,23 +232,33 @@ let run () =
 (* documented/testing *)
 let runFor browsers =
     // suites are in reverse order and have to be reversed before running the tests
-    let currentSuites = suites |> List.rev
-    suites <- [new suite()]
+    let currentSuites = suites
+
     match box browsers with
         | :? (types.BrowserStartMode list) as browsers ->
-            browsers
-            |> List.iter (fun browser ->
-                toString browser
-                |> sprintf "Running tests with %s browser"
-                |> context
-                once (fun _ -> start browser)
-                suites <- suites @ currentSuites)
+            let newSuites =
+              browsers
+              |> List.rev
+              |> List.map (fun browser ->
+                  let suite = new suite()
+                  suite.Context <- sprintf "Running tests with %s browser" (toString browser)
+                  suite.Once <- fun _ -> start browser                                
+                  let currentSuites2 = currentSuites |> List.map(fun suite -> suite.Clone())
+                  currentSuites2 |> List.iter (fun suite -> suite.Context <- sprintf "(%s) %s" (toString browser) suite.Context)
+                  currentSuites2 @ [suite])
+              |> List.concat
+            suites <- newSuites
         | :? (IWebDriver list) as browsers ->
-            browsers
-            |> List.iter (fun browser ->
-                browser.ToString()
-                |> sprintf "Running tests with %s browser"
-                |> context
-                once (fun _ -> switchTo browser)
-                suites <- suites @ currentSuites)
+            let newSuites =
+              browsers
+              |> List.rev
+              |> List.map (fun browser ->
+                  let suite = new suite()
+                  suite.Context <- sprintf "Running tests with %s browser" (browser.ToString())                
+                  suite.Once <- fun _ -> switchTo browser
+                  let currentSuites2 = currentSuites |> List.map(fun suite -> suite.Clone())
+                  currentSuites2 |> List.iter (fun suite -> suite.Context <- sprintf "(%s) %s" (browser.ToString()) suite.Context)
+                  currentSuites2 @ [suite])
+              |> List.concat
+            suites <- newSuites
         | _ -> raise <| Exception "I dont know what you have given me"
diff --git a/src/canopy/types.fs b/src/canopy/types.fs
@@ -85,6 +85,7 @@ type suite () = class
     member val Manys : Test list = [] with get, set
     member val Always : Test list = [] with get, set
     member val IsParallel = false with get, set
+    member this.Clone() = this.MemberwiseClone() :?> suite
 end
 
 type Result =