Added regex NOT for #237

lefthandedgoat · Feb 27, 2016 · f748591 · f748591
1 parent b2663f5
commit f748591
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/canopy/canopy.fs b/src/canopy/canopy.fs
@@ -505,6 +505,13 @@ let ( =~ ) cssSelector pattern =
         | :? CanopyElementNotFoundException as ex -> raise (CanopyEqualityFailedException(sprintf "%s%sregex equality check failed.  expected: %s, got:" ex.Message Environment.NewLine pattern))
         | :? WebDriverTimeoutException -> raise (CanopyEqualityFailedException(sprintf "regex equality check failed.  expected: %s, got: %s" pattern (read cssSelector)))
 
+let ( !=~ ) cssSelector pattern =
+    try
+        wait compareTimeout (fun _ -> regexMatch pattern (read cssSelector) |> not)
+    with
+        | :? CanopyElementNotFoundException as ex -> raise (CanopyEqualityFailedException(sprintf "%s%sregex not equality check failed.  expected NOT: %s, got:" ex.Message Environment.NewLine pattern))
+        | :? WebDriverTimeoutException -> raise (CanopyEqualityFailedException(sprintf "regex not equality check failed.  expected NOT: %s, got: %s" pattern (read cssSelector)))
+
 let ( *~ ) cssSelector pattern =
     try        
         wait compareTimeout (fun _ -> ( cssSelector |> elements |> Seq.exists(fun element -> regexMatch pattern (textOf element))))

diff --git a/tests/basictests/Program.fs b/tests/basictests/Program.fs
@@ -407,6 +407,13 @@ context "other tests"
     "#lastName" << "Grey"
     "#lastName" =~ "Gr[ae]y"
 
+"regex not test" &&& fun _ ->
+    url testpage
+    "#lastName" << "Gray"
+    "#lastName" !=~ "Gr[o]y"
+    "#lastName" << "Grey"
+    "#lastName" !=~ "Gr[o]y"
+
 "regex one of many test" &&& fun _ ->
     url testpage
     "#colors li" *~ "gr[ea]y"