#245 Remove dependency on Selenium Support, add own wait function

lefthandedgoat · Mar 13, 2016 · 10b3b13 · 10b3b13
1 parent 68dd6dc
commit 10b3b13
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 50 deletions.
diff --git a/paket.dependencies b/paket.dependencies
@@ -3,7 +3,6 @@ source https://www.nuget.org/api/v2/
 nuget NuGet.CommandLine
 nuget FSharp.Core >= 3.0.2 lowest_matching:true
 nuget Newtonsoft.Json framework: >= net40
-nuget Selenium.Support
 nuget Selenium.WebDriver
 nuget SizSelCsZzz framework: >= net40
 nuget FAKE

diff --git a/paket.lock b/paket.lock
@@ -11,7 +11,7 @@ NUGET
       FSharp.Compiler.Service (>= 2.0.0.3)
     Newtonsoft.Json (6.0.8) - framework: >= net40
     NuGet.CommandLine (3.3.0)
-    Selenium.Support (2.52.0)
+    Selenium.Support (2.52.0) - framework: >= net40
       Selenium.WebDriver (>= 2.52.0)
     Selenium.WebDriver (2.52.0)
     SizSelCsZzz (0.3.36) - framework: >= net40

diff --git a/src/canopy/canopy.fs b/src/canopy/canopy.fs
@@ -3,7 +3,6 @@ module canopy.core
 
 open OpenQA.Selenium.Firefox
 open OpenQA.Selenium
-open OpenQA.Selenium.Support.UI
 open OpenQA.Selenium.Interactions
 open SizSelCsZzz
 open Microsoft.FSharp.Core.Printf
@@ -96,17 +95,29 @@ let puts text =
             infoDiv.innerHTML = 'locating: " + escapedText + "';"
         swallowedJs info
 
-let private wait timeout f =
-    let wait = new WebDriverWait(browser, TimeSpan.FromSeconds(timeout))
-    wait.Until(fun _ -> (
-                            try
-                                (f ()) = true
-                            with
-                            | :? CanopyException as ce -> raise(ce)
-                            | _ -> false
-                        )
-                ) |> ignore        
-    ()
+let waitResults timeout (f : unit -> 'a) =
+    let sw = System.Diagnostics.Stopwatch.StartNew()
+    let rec innerwait timeout f =
+        let sleepAndWait () = sleep waitSleep; innerwait timeout f
+        if sw.Elapsed.TotalSeconds >= timeout then raise <| WebDriverTimeoutException("Timed out!")
+
+        try
+            let result = f()
+            match box result with
+              | :? bool as b ->
+                   if b then result
+                   else sleepAndWait ()
+              | _ as o ->
+                    if o <> null then result
+                    else sleepAndWait ()
+        with
+          | :? WebDriverTimeoutException as ex -> reraise()
+          | :? CanopyException as ce -> raise(ce)
+          | _ -> sleepAndWait ()
+
+    innerwait timeout f
+
+let wait timeout (f : unit -> bool) = waitResults timeout f |> ignore
 
 let private colorizeAndSleep cssSelector =
     puts cssSelector
@@ -187,7 +198,7 @@ let suggestOtherSelectors cssSelector =
 let describe text =
     puts text
 
-let waitFor2 message (f : unit -> bool) =
+let waitFor2 message f =
     try        
         wait compareTimeout f
     with
@@ -231,16 +242,16 @@ let rec private findElements cssSelector (searchContext : ISearchContext) : IWeb
 
 let private findByFunction cssSelector timeout waitFunc searchContext reliable =
     if wipTest then colorizeAndSleep cssSelector
-    let wait = new WebDriverWait(browser, TimeSpan.FromSeconds(elementTimeout))
+
     try
         if reliable then
             let elements = ref []
-            wait.Until(fun _ -> 
+            wait elementTimeout (fun _ -> 
                 elements := waitFunc cssSelector searchContext
-                not <| List.isEmpty !elements) |> ignore
+                not <| List.isEmpty !elements)
             !elements
         else
-            wait.Until(fun _ -> waitFunc cssSelector searchContext)
+            waitResults elementTimeout (fun _ -> waitFunc cssSelector searchContext)
     with
         | :? WebDriverTimeoutException ->   
             suggestOtherSelectors cssSelector

diff --git a/src/canopy/canopy.fsproj b/src/canopy/canopy.fsproj
@@ -129,15 +129,6 @@
     </When>
   </Choose>
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v3.5'">
-      <ItemGroup>
-        <Reference Include="WebDriver.Support">
-          <HintPath>..\..\packages\Selenium.Support\lib\net35\WebDriver.Support.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
     <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1')">
       <ItemGroup>
         <Reference Include="WebDriver.Support">
@@ -179,4 +170,4 @@
       </ItemGroup>
     </When>
   </Choose>
-</Project>
+</Project>
diff --git a/src/canopy/configuration.fs b/src/canopy/configuration.fs
@@ -23,6 +23,7 @@ let mutable elementTimeout = 10.0
 let mutable compareTimeout = 10.0
 let mutable pageTimeout = 10.0
 let mutable wipSleep = 1.0
+let mutable waitSleep = 0.5
 let mutable runFailedContextsFirst = false
 let mutable reporter : IReporter = new ConsoleReporter() :> IReporter
 let mutable disableSuggestOtherSelectors = false

diff --git a/src/sampleprojectstructure/sampleprojectstructure.fsproj b/src/sampleprojectstructure/sampleprojectstructure.fsproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -114,15 +114,6 @@
     </When>
   </Choose>
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v3.5'">
-      <ItemGroup>
-        <Reference Include="WebDriver.Support">
-          <HintPath>..\..\packages\Selenium.Support\lib\net35\WebDriver.Support.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
     <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1')">
       <ItemGroup>
         <Reference Include="WebDriver.Support">
@@ -153,4 +144,4 @@
       </ItemGroup>
     </When>
   </Choose>
-</Project>
+</Project>
diff --git a/tests/basictests/basictests.fsproj b/tests/basictests/basictests.fsproj
@@ -131,15 +131,6 @@
     </When>
   </Choose>
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v3.5'">
-      <ItemGroup>
-        <Reference Include="WebDriver.Support">
-          <HintPath>..\..\packages\Selenium.Support\lib\net35\WebDriver.Support.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
     <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1')">
       <ItemGroup>
         <Reference Include="WebDriver.Support">
@@ -170,4 +161,4 @@
       </ItemGroup>
     </When>
   </Choose>
-</Project>
+</Project>