From 87f3e7a9a4ec8e055c59a4b977f8518bd0a82a40 Mon Sep 17 00:00:00 2001
From: Chris Holt <lefthandedgoat@gmail.com>
Date: Sun, 7 Sep 2014 21:09:44 -0500
Subject: [PATCH] canopy performance improvements

---
 Dojo/Canopy2048/Canopy2048.fsproj | 10 +++++-----
 Dojo/Canopy2048/Interactions.fs   | 17 +++++++++++++----
 Dojo/Canopy2048/Program.fs        |  3 +++
 Dojo/Canopy2048/packages.config   | 10 +++++-----
 4 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/Dojo/Canopy2048/Canopy2048.fsproj b/Dojo/Canopy2048/Canopy2048.fsproj
index 9031d76..3916054 100644
--- a/Dojo/Canopy2048/Canopy2048.fsproj
+++ b/Dojo/Canopy2048/Canopy2048.fsproj
@@ -39,7 +39,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="canopy">
-      <HintPath>packages\canopy.0.9.8\lib\canopy.dll</HintPath>
+      <HintPath>packages\canopy.0.9.14\lib\canopy.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="mscorlib" />
@@ -47,11 +47,11 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json">
-      <HintPath>packages\Newtonsoft.Json.5.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <HintPath>packages\Newtonsoft.Json.6.0.5\lib\net40\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="SizSelCsZzz">
-      <HintPath>packages\SizSelCsZzz.0.3.35.0\lib\SizSelCsZzz.dll</HintPath>
+      <HintPath>packages\SizSelCsZzz.0.3.36.0\lib\SizSelCsZzz.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -59,11 +59,11 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Numerics" />
     <Reference Include="WebDriver">
-      <HintPath>packages\Selenium.WebDriver.2.41.0\lib\net40\WebDriver.dll</HintPath>
+      <HintPath>packages\Selenium.WebDriver.2.42.0\lib\net40\WebDriver.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="WebDriver.Support">
-      <HintPath>packages\Selenium.Support.2.41.0\lib\net40\WebDriver.Support.dll</HintPath>
+      <HintPath>packages\Selenium.Support.2.42.0\lib\net40\WebDriver.Support.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
diff --git a/Dojo/Canopy2048/Interactions.fs b/Dojo/Canopy2048/Interactions.fs
index 519274c..1b80015 100644
--- a/Dojo/Canopy2048/Interactions.fs
+++ b/Dojo/Canopy2048/Interactions.fs
@@ -5,13 +5,22 @@ open runner
 
 module Interactions =
 
-    let lost () =
-        match someElement ".game-message.game-over" with
+    let lostSelector = css ".game-message.game-over"
+    let winSelector = css ".game-message.game-won"
+    let gameOverSelector = css ".game-message.game-won, .game-message.game-over"
+
+    let lost () =        
+        match someElement <| lostSelector with
+        | None -> false
+        | Some(_) -> true
+        
+    let won () =        
+        match someElement <| winSelector with
         | None -> false
         | Some(_) -> true
 
-    let won () =
-        match someElement ".game-message.game-won" with
+    let gameEnded () =
+        match someElement <| gameOverSelector with
         | None -> false
         | Some(_) -> true
 
diff --git a/Dojo/Canopy2048/Program.fs b/Dojo/Canopy2048/Program.fs
index d018fc0..1497bc5 100644
--- a/Dojo/Canopy2048/Program.fs
+++ b/Dojo/Canopy2048/Program.fs
@@ -39,6 +39,9 @@ open Interactions
 
 module program = 
 
+    canopy.configuration.optimizeBySkippingIFrameCheck <- true
+    canopy.configuration.optimizeByDisablingCoverageReport <- true
+
     "starting a game of 2048" &&& fun _ ->
 
         printfn "Game started."
diff --git a/Dojo/Canopy2048/packages.config b/Dojo/Canopy2048/packages.config
index d64cd98..1c8ffd4 100644
--- a/Dojo/Canopy2048/packages.config
+++ b/Dojo/Canopy2048/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="canopy" version="0.9.8" targetFramework="net40" />
-  <package id="Newtonsoft.Json" version="5.0.1" targetFramework="net40" />
-  <package id="Selenium.Support" version="2.41.0" targetFramework="net40" />
-  <package id="Selenium.WebDriver" version="2.41.0" targetFramework="net40" />
-  <package id="SizSelCsZzz" version="0.3.35.0" targetFramework="net40" />
+  <package id="canopy" version="0.9.14" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="6.0.5" targetFramework="net40" />
+  <package id="Selenium.Support" version="2.42.0" targetFramework="net40" />
+  <package id="Selenium.WebDriver" version="2.42.0" targetFramework="net40" />
+  <package id="SizSelCsZzz" version="0.3.36.0" targetFramework="net40" />
 </packages>
\ No newline at end of file