Fix for &&&&& #195

lefthandedgoat · May 20, 2015 · 4901e2a · 4901e2a
1 parent 73251c1
commit 4901e2a
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 6 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -135,6 +135,9 @@
 #### 0.9.22 - March 4 2015
 * Updated to Selenium 2.45, thanks @pottereric
 
-#### 0.9.23 - May 15 2015
+#### 0.9.23 - May 18 2015
 * Added &&&&& (always) tests which will run in both normal mode and wip mode [Issue #195](https://github.com/lefthandedgoat/canopy/issues/195)
-* Added runFor which lets you run the same set of tests for multiple browsers [Issue #190](https://github.com/lefthandedgoat/canopy/issues/190)
+* Added runFor which lets you run the same set of tests for multiple browsers [Issue #190](https://github.com/lefthandedgoat/canopy/issues/190)
+
+#### 0.9.24 - May 19 2015
+* Fixed bug related to new &&&&& (always) operator [Issue #195](https://github.com/lefthandedgoat/canopy/issues/195)
diff --git a/src/canopy/AssemblyInfo.fs b/src/canopy/AssemblyInfo.fs
@@ -4,9 +4,9 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("canopy")>]
 [<assembly: AssemblyProductAttribute("canopy")>]
 [<assembly: AssemblyDescriptionAttribute("F# web testing framework")>]
-[<assembly: AssemblyVersionAttribute("0.9.23")>]
-[<assembly: AssemblyFileVersionAttribute("0.9.23")>]
+[<assembly: AssemblyVersionAttribute("0.9.24")>]
+[<assembly: AssemblyFileVersionAttribute("0.9.24")>]
 do ()
 
 module internal AssemblyVersionInformation =
-    let [<Literal>] Version = "0.9.23"
+    let [<Literal>] Version = "0.9.24"
diff --git a/src/canopy/runner.fs b/src/canopy/runner.fs
@@ -116,7 +116,7 @@ let run () =
 
     //run only wips if there are any
     if suites |> List.exists (fun s -> s.Wips.IsEmpty = false) then
-        suites <- suites |> List.filter (fun s -> s.Wips.IsEmpty = false)
+        suites <- suites |> List.filter (fun s -> s.Wips.IsEmpty = false || s.Always.IsEmpty = false)
 
     suites
     |> List.iter (fun s ->

diff --git a/tests/basictests/Program.fs b/tests/basictests/Program.fs
@@ -18,6 +18,9 @@ reporter <- new LiveHtmlReporter(Chrome, configuration.chromeDir) :> IReporter
 
 failFast := true
 
+file1.all()
+file2.all()
+
 context "context1"
 once (fun _ -> Console.WriteLine "once")
 before (fun _ -> Console.WriteLine "before")

diff --git a/tests/basictests/basictests.fsproj b/tests/basictests/basictests.fsproj
@@ -54,6 +54,8 @@
   </Choose>
   <Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" />
   <ItemGroup>
+    <Compile Include="file1.fs" />
+    <Compile Include="file2.fs" />
     <Compile Include="Program.fs" />
     <None Include="app.config" />
     <None Include="packages.config" />

diff --git a/tests/basictests/file1.fs b/tests/basictests/file1.fs
@@ -0,0 +1,17 @@
+module file1
+
+open canopy
+open runner
+
+let testpage = "http://lefthandedgoat.github.io/canopy/testpages/" 
+
+let all() =
+    context "file1"
+
+    "from file 1 2" &&& fun _ ->    
+        url testpage
+        "#welcome" == "Welcome"
+
+    "from file 1 2" &&& fun _ ->    
+        url testpage
+        "#welcome" == "Welcome"
diff --git a/tests/basictests/file2.fs b/tests/basictests/file2.fs
@@ -0,0 +1,17 @@
+module file2
+
+open canopy
+open runner
+
+let testpage = "http://lefthandedgoat.github.io/canopy/testpages/" 
+
+let all() =
+    context "file2"
+
+    "from file 2 1" &&&&& fun _ ->    
+        url testpage
+        "#welcome" == "Welcome"
+
+    "from file 2 2" &&&&& fun _ ->    
+        url testpage
+        "#welcome" == "Welcome"