Release version 0.9.18

lefthandedgoat · Dec 9, 2014 · 5229a45 · 5229a45
1 parent e078739
commit 5229a45
Show file tree

Hide file tree

Showing 13 changed files with 80 additions and 33 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -114,4 +114,9 @@
 
 #### 0.9.17 - October 20 2014
 * Added back and forward via pull request from @JonCanning, thanks! [Pull Request #169](https://github.com/lefthandedgoat/canopy/pull/169)
-* Fixed issue with using select/options in iframes, thanks @lokki [Issue #170](https://github.com/lefthandedgoat/canopy/issues/170)
+* Fixed issue with using select/options in iframes, thanks @lokki [Issue #170](https://github.com/lefthandedgoat/canopy/issues/170)
+
+#### 0.9.18 - December 8 2014
+* Added switchToTab and closeTab [Issue #165](https://github.com/lefthandedgoat/canopy/issues/165)
+* Added hover [Issue #172](https://github.com/lefthandedgoat/canopy/issues/172)
+* Updated to latest Selenium 2.44.0
diff --git a/nuget/canopy.nuspec b/nuget/canopy.nuspec
@@ -12,8 +12,9 @@
     <releaseNotes>@releaseNotes@</releaseNotes>
     <tags>@tags@</tags>
     <dependencies>
-      <dependency id="Selenium.WebDriver" version="[2.43.1]" />
-      <dependency id="Selenium.Support" version="[2.43.1]" />
+	  <dependency id="FSharp.Core.3" version="[0.0.2]" />
+      <dependency id="Selenium.WebDriver" version="[2.44.0]" />
+      <dependency id="Selenium.Support" version="[2.44.0]" />
       <dependency id="SizSelCsZzz" version="[0.3.36.0]" />
     </dependencies>
   </metadata>

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.17")>]
-[<assembly: AssemblyFileVersionAttribute("0.9.17")>]
+[<assembly: AssemblyVersionAttribute("0.9.18")>]
+[<assembly: AssemblyFileVersionAttribute("0.9.18")>]
 do ()
 
 module internal AssemblyVersionInformation =
-    let [<Literal>] Version = "0.9.17"
+    let [<Literal>] Version = "0.9.18"
diff --git a/src/canopy/canopy.fs b/src/canopy/canopy.fs
@@ -684,6 +684,14 @@ let start b =
 
 let switchTo b = browser <- b
 
+let switchToTab number =
+    let tabs = browser.WindowHandles;
+    browser.SwitchTo().Window(tabs.[(number - 1)]) |> ignore
+
+let closeTab number =
+    switchToTab number
+    browser.Close()
+
 let tile (browsers : IWebDriver list) =   
     let h = System.Windows.Forms.Screen.PrimaryScreen.WorkingArea.Height
     let w = System.Windows.Forms.Screen.PrimaryScreen.WorkingArea.Width

diff --git a/src/canopy/canopy.fsproj b/src/canopy/canopy.fsproj
@@ -64,12 +64,20 @@
     <Compile Include="userAgents.fs" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="FSharp.Core">
+      <HintPath>..\..\packages\FSharp.Core.3.0.0.2\lib\net40\FSharp.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <Private>False</Private>
     </Reference>
     <Reference Include="mscorlib" />
     <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\packages\Newtonsoft.Json.6.0.5\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="policy.2.3.FSharp.Core">
+      <HintPath>..\..\packages\FSharp.Core.3.0.0.2\lib\net40\policy.2.3.FSharp.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="SizSelCsZzz">
@@ -83,11 +91,11 @@
     <Reference Include="System.Web" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="WebDriver">
-      <HintPath>..\..\packages\Selenium.WebDriver.2.43.1\lib\net40\WebDriver.dll</HintPath>
+      <HintPath>..\..\packages\Selenium.WebDriver.2.44.0\lib\net40\WebDriver.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="WebDriver.Support">
-      <HintPath>..\..\packages\Selenium.Support.2.43.1\lib\net40\WebDriver.Support.dll</HintPath>
+      <HintPath>..\..\packages\Selenium.Support.2.44.0\lib\net40\WebDriver.Support.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>

diff --git a/src/canopy/packages.config b/src/canopy/packages.config
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="6.0.5" targetFramework="net40" />
-  <package id="Selenium.Support" version="2.43.1" targetFramework="net40" />
-  <package id="Selenium.WebDriver" version="2.43.1" targetFramework="net40" />
+  <package id="FSharp.Core.3" version="0.0.2" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="6.0.6" targetFramework="net40" />
+  <package id="Selenium.Support" version="2.44.0" targetFramework="net40" />
+  <package id="Selenium.WebDriver" version="2.44.0" targetFramework="net40" />
   <package id="SizSelCsZzz" version="0.3.36.0" targetFramework="net40" />
 </packages>
diff --git a/src/sampleprojectstructure/packages.config b/src/sampleprojectstructure/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Selenium.Support" version="2.43.0" targetFramework="net45" />
-  <package id="Selenium.WebDriver" version="2.43.0" targetFramework="net45" />
+  <package id="FSharp.Core.3" version="0.0.2" targetFramework="net45" />
+  <package id="Selenium.Support" version="2.44.0" targetFramework="net45" />
+  <package id="Selenium.WebDriver" version="2.44.0" targetFramework="net45" />
 </packages>
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>
@@ -38,20 +38,28 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="FSharp.Core">
+      <HintPath>..\..\packages\FSharp.Core.3.0.0.2\lib\net40\FSharp.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <Private>True</Private>
     </Reference>
     <Reference Include="mscorlib" />
+    <Reference Include="policy.2.3.FSharp.Core">
+      <HintPath>..\..\packages\FSharp.Core.3.0.0.2\lib\net40\policy.2.3.FSharp.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Numerics" />
     <Reference Include="WebDriver">
-      <HintPath>..\..\packages\Selenium.WebDriver.2.43.0\lib\net40\WebDriver.dll</HintPath>
+      <HintPath>..\..\packages\Selenium.WebDriver.2.44.0\lib\net40\WebDriver.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="WebDriver.Support">
-      <HintPath>..\..\packages\Selenium.Support.2.43.0\lib\net40\WebDriver.Support.dll</HintPath>
+      <HintPath>..\..\packages\Selenium.Support.2.44.0\lib\net40\WebDriver.Support.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>

diff --git a/tests/basictests/Program.fs b/tests/basictests/Program.fs
@@ -521,11 +521,11 @@ context "hints tests"
     text "ajax button not clicked" == "ajax button not clicked"
 
 context "hovering"
-"hover works" &&&& fun _ ->
-    url "http://api.jquery.com/hover/"
-    (someElement "body ul li span").IsNone === true
+"hover works" &&& fun _ ->
+    url testpage
+    "#hover" == "not hovered"
     hover "Milk"
-    (someElement "body ul li span").IsNone === false
+    "#hover" == "hovered"
 
 context "dragging"
 "draging works" &&& fun _ ->

diff --git a/tests/basictests/basictests.fsproj b/tests/basictests/basictests.fsproj
@@ -59,24 +59,29 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <Reference Include="FSharp.Core">
+      <HintPath>..\..\packages\FSharp.Core.3.0.0.2\lib\net40\FSharp.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="mscorlib" />
     <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\packages\Newtonsoft.Json.6.0.5\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="policy.2.3.FSharp.Core">
+      <HintPath>..\..\packages\FSharp.Core.3.0.0.2\lib\net40\policy.2.3.FSharp.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Numerics" />
     <Reference Include="WebDriver">
-      <HintPath>..\..\packages\Selenium.WebDriver.2.43.0\lib\net40\WebDriver.dll</HintPath>
+      <HintPath>..\..\packages\Selenium.WebDriver.2.44.0\lib\net40\WebDriver.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="WebDriver.Support">
-      <HintPath>..\..\packages\Selenium.Support.2.43.0\lib\net40\WebDriver.Support.dll</HintPath>
+      <HintPath>..\..\packages\Selenium.Support.2.44.0\lib\net40\WebDriver.Support.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>

diff --git a/tests/basictests/packages.config b/tests/basictests/packages.config
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="6.0.5" targetFramework="net40" />
-  <package id="Selenium.Support" version="2.43.0" targetFramework="net40" />
-  <package id="Selenium.WebDriver" version="2.43.0" targetFramework="net40" />
+  <package id="FSharp.Core.3" version="0.0.2" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="6.0.6" targetFramework="net40" />
+  <package id="Selenium.Support" version="2.44.0" targetFramework="net40" />
+  <package id="Selenium.WebDriver" version="2.44.0" targetFramework="net40" />
 </packages>
diff --git a/tests/documentationtests/documentationtests.fsproj b/tests/documentationtests/documentationtests.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">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -61,20 +61,28 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="FSharp.Core">
+      <HintPath>..\..\packages\FSharp.Core.3.0.0.2\lib\net40\FSharp.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <Private>True</Private>
     </Reference>
     <Reference Include="mscorlib" />
+    <Reference Include="policy.2.3.FSharp.Core">
+      <HintPath>..\..\packages\FSharp.Core.3.0.0.2\lib\net40\policy.2.3.FSharp.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Numerics" />
     <Reference Include="WebDriver">
-      <HintPath>..\..\packages\Selenium.WebDriver.2.43.0\lib\net40\WebDriver.dll</HintPath>
+      <HintPath>..\..\packages\Selenium.WebDriver.2.44.0\lib\net40\WebDriver.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="WebDriver.Support">
-      <HintPath>..\..\packages\Selenium.Support.2.43.0\lib\net40\WebDriver.Support.dll</HintPath>
+      <HintPath>..\..\packages\Selenium.Support.2.44.0\lib\net40\WebDriver.Support.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>

diff --git a/tests/documentationtests/packages.config b/tests/documentationtests/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Selenium.Support" version="2.43.0" targetFramework="net40" />
-  <package id="Selenium.WebDriver" version="2.43.0" targetFramework="net40" />
+  <package id="FSharp.Core.3" version="0.0.2" targetFramework="net40" />
+  <package id="Selenium.Support" version="2.44.0" targetFramework="net40" />
+  <package id="Selenium.WebDriver" version="2.44.0" targetFramework="net40" />
 </packages>