diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index dc098c3e..dcad3e98 100644 --- 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) \ No newline at end of file +* 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 index 3e1ee637..e45f2d32 100644 --- a/src/canopy/AssemblyInfo.fs +++ b/src/canopy/AssemblyInfo.fs @@ -4,9 +4,9 @@ open System.Reflection [] [] [] -[] -[] +[] +[] do () module internal AssemblyVersionInformation = - let [] Version = "0.9.23" + let [] Version = "0.9.24" diff --git a/src/canopy/runner.fs b/src/canopy/runner.fs index a9d7f22c..bccb0618 100644 --- 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 index 95b9d433..27eceb3a 100644 --- 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 index 8908daa4..d35beac9 100644 --- a/tests/basictests/basictests.fsproj +++ b/tests/basictests/basictests.fsproj @@ -54,6 +54,8 @@ + + diff --git a/tests/basictests/file1.fs b/tests/basictests/file1.fs new file mode 100644 index 00000000..1908ee47 --- /dev/null +++ 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" \ No newline at end of file diff --git a/tests/basictests/file2.fs b/tests/basictests/file2.fs new file mode 100644 index 00000000..57ed8c05 --- /dev/null +++ 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" \ No newline at end of file