#244 Remove dependency on SizSelCsZzz

lefthandedgoat · Mar 13, 2016 · c286447 · c286447
1 parent d87bc0f
commit c286447
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 113 deletions.
diff --git a/paket.dependencies b/paket.dependencies
@@ -2,8 +2,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.WebDriver
-nuget SizSelCsZzz framework: >= net40
 nuget FAKE
 nuget FSharp.Formatting
diff --git a/paket.lock b/paket.lock
@@ -1,20 +1,13 @@
 NUGET
   remote: https://www.nuget.org/api/v2
   specs:
-    FAKE (4.21.4)
+    FAKE (4.22.0)
     FSharp.Compiler.Service (2.0.0.6)
     FSharp.Core (3.0.2)
     FSharp.Formatting (2.14.0)
       FSharp.Compiler.Service (>= 2.0.0.3 < 2.1.0)
       FSharpVSPowerTools.Core (>= 2.3.0 < 2.4.0)
     FSharpVSPowerTools.Core (2.3.0)
       FSharp.Compiler.Service (>= 2.0.0.3)
-    Newtonsoft.Json (6.0.8) - framework: >= net40
     NuGet.CommandLine (3.3.0)
-    Selenium.Support (2.52.0) - framework: >= net40
-      Selenium.WebDriver (>= 2.52.0)
     Selenium.WebDriver (2.52.0)
-    SizSelCsZzz (0.3.36) - framework: >= net40
-      Newtonsoft.Json (>= 6.0)
-      Selenium.Support (>= 2.40)
-      Selenium.WebDriver (>= 2.40)
diff --git a/src/canopy/canopy.fs b/src/canopy/canopy.fs
@@ -4,7 +4,6 @@ module canopy.core
 open OpenQA.Selenium.Firefox
 open OpenQA.Selenium
 open OpenQA.Selenium.Interactions
-open SizSelCsZzz
 open Microsoft.FSharp.Core.Printf
 open System.IO
 open System
@@ -16,7 +15,6 @@ open finders
 open System.Drawing
 open System.Drawing.Imaging
 
-let mutable (browser : IWebDriver) = null
 let mutable (failureMessage : string) = null
 let mutable wipTest = false
 let mutable searchedFor : (string * string) list = []
@@ -94,7 +92,7 @@ let puts text =
             document.getElementsByTagName('body')[0].appendChild(infoDiv); 
             infoDiv.innerHTML = 'locating: " + escapedText + "';"
         swallowedJs info
-
+        
 let private colorizeAndSleep cssSelector =
     puts cssSelector
     swallowedJs <| sprintf "document.querySelector('%s').style.border = 'thick solid #FFF467';" cssSelector

diff --git a/src/canopy/canopy.fsproj b/src/canopy/canopy.fsproj
@@ -109,37 +109,6 @@
       </ItemGroup>
     </When>
   </Choose>
-  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0')">
-      <ItemGroup>
-        <Reference Include="Newtonsoft.Json">
-          <HintPath>..\..\packages\Newtonsoft.Json\lib\net40\Newtonsoft.Json.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(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="Newtonsoft.Json">
-          <HintPath>..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
-  <Choose>
-    <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">
-          <HintPath>..\..\packages\Selenium.Support\lib\net40\WebDriver.Support.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
   <Choose>
     <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v3.5'">
       <ItemGroup>
@@ -160,15 +129,4 @@
       </ItemGroup>
     </When>
   </Choose>
-  <Choose>
-    <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="SizSelCsZzz">
-          <HintPath>..\..\packages\SizSelCsZzz\lib\SizSelCsZzz.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
 </Project>
diff --git a/src/canopy/finders.fs b/src/canopy/finders.fs
@@ -1,19 +1,15 @@
 module canopy.finders
 
 open OpenQA.Selenium
-open SizSelCsZzz
+open System.Collections.ObjectModel
+open System.Collections.Generic
 
 //have to use the ReadonlyCollection<IWebElement> because thats what selenium uses and it wont cast to seq<IWebElement> or something, and type inference isnt playing nice
 //basically a hack because I dont know a better way
-let findByCss (cssSelector : string) (f : (By -> System.Collections.ObjectModel.ReadOnlyCollection<IWebElement>)) =
+let findByCss (cssSelector : string) (f : (By -> ReadOnlyCollection<IWebElement>)) =
     try
         f(By.CssSelector(cssSelector)) |> List.ofSeq
     with | ex -> []
-
-let findByJQuery cssSelector f =
-    try
-        f(ByJQuery.CssSelector(cssSelector)) |> List.ofSeq
-    with | ex -> []
 
 let findByXpath xpath f =
     try
@@ -53,6 +49,29 @@ let findByValue value f =
         findByCss (sprintf """*[value="%s"]""" value) f |> List.ofSeq        
     with | _ -> []
 
+//Inspired by https://github.com/RaYell/selenium-webdriver-extensions
+let private loadJQuery () = 
+    let jsBrowser = browser :?> IJavaScriptExecutor
+    let jqueryExistsScript = """return (typeof window.jQuery) === 'function';"""
+    let exists = jsBrowser.ExecuteScript(jqueryExistsScript) :?> bool
+    if not exists then
+        let load = """
+            var jq = document.createElement('script');
+            jq.src = '//code.jquery.com/jquery-2.2.1.min.js';
+            document.getElementsByTagName('head')[0].appendChild(jq);
+         """
+        jsBrowser.ExecuteScript(load) |> ignore
+        wait 2.0 (fun _ -> jsBrowser.ExecuteScript(jqueryExistsScript) :?> bool)
+
+//total cheese but instead of making a By type, we will just do 'FindElements' style because
+//thats the only way its currently used. Cry
+let findByJQuery cssSelector _ =
+    try
+        loadJQuery()
+        let script = sprintf "return jQuery('%s').get();" cssSelector
+        (browser :?> IJavaScriptExecutor).ExecuteScript(script) :?> ReadOnlyCollection<IWebElement> |> List.ofSeq
+    with | ex -> []
+
 //you can use this as an example to how to extend canopy by creating your own set of finders, tweaking the current collection, or adding/removing
 let mutable defaultFinders = 
     (fun cssSelector f ->
@@ -66,5 +85,5 @@ let mutable defaultFinders =
         }
     )
 
-let addedHints = System.Collections.Generic.Dictionary<string, string list>()
-let hints = new System.Collections.Generic.Dictionary<string, seq<(string -> (By -> System.Collections.ObjectModel.ReadOnlyCollection<IWebElement>) -> IWebElement list)>>()
+let addedHints = Dictionary<string, string list>()
+let hints = new Dictionary<string, seq<(string -> (By -> ReadOnlyCollection<IWebElement>) -> IWebElement list)>>()
diff --git a/src/canopy/paket.references b/src/canopy/paket.references
@@ -1,5 +1,2 @@
 FSharp.Core
-Newtonsoft.Json
-Selenium.Support
-Selenium.WebDriver
-SizSelCsZzz
+Selenium.WebDriver
diff --git a/src/canopy/types.fs b/src/canopy/types.fs
@@ -5,6 +5,8 @@ open System
 open OpenQA.Selenium
 open Microsoft.FSharp.Reflection
 
+let mutable (browser : IWebDriver) = null
+
 type CanopyException(message) = inherit Exception(message)
 type CanopyReadOnlyException(message) = inherit CanopyException(message)
 type CanopyOptionNotFoundException(message) = inherit CanopyException(message)

diff --git a/src/sampleprojectstructure/paket.references b/src/sampleprojectstructure/paket.references
@@ -1,3 +1,2 @@
 FSharp.Core
-Selenium.Support
 Selenium.WebDriver
diff --git a/src/sampleprojectstructure/sampleprojectstructure.fsproj b/src/sampleprojectstructure/sampleprojectstructure.fsproj
@@ -113,17 +113,6 @@
       </ItemGroup>
     </When>
   </Choose>
-  <Choose>
-    <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">
-          <HintPath>..\..\packages\Selenium.Support\lib\net40\WebDriver.Support.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
   <Choose>
     <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v3.5'">
       <ItemGroup>

diff --git a/tests/basictests/basictests.fsproj b/tests/basictests/basictests.fsproj
@@ -110,37 +110,6 @@
       </ItemGroup>
     </When>
   </Choose>
-  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0')">
-      <ItemGroup>
-        <Reference Include="Newtonsoft.Json">
-          <HintPath>..\..\packages\Newtonsoft.Json\lib\net40\Newtonsoft.Json.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(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="Newtonsoft.Json">
-          <HintPath>..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
-  <Choose>
-    <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">
-          <HintPath>..\..\packages\Selenium.Support\lib\net40\WebDriver.Support.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
   <Choose>
     <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v3.5'">
       <ItemGroup>

diff --git a/tests/basictests/paket.references b/tests/basictests/paket.references
@@ -1,4 +1,2 @@
 FSharp.Core
-Newtonsoft.Json
-Selenium.Support
 Selenium.WebDriver