From b50b1bb044e197157fa60ae733eb517ef982e42d Mon Sep 17 00:00:00 2001
From: Pedro Ramirez <pedro.rmrz.srz@gmail.com>
Date: Thu, 20 Aug 2015 12:17:57 -0500
Subject: [PATCH] Run canopy on OSX and Linux with mono

- Added Safari to the available browsers
- Path for the drivers are is now different depending on the OS
---
 src/canopy/canopy.fs        |  3 +++
 src/canopy/configuration.fs | 16 +++++++++++++---
 src/canopy/reporters.fs     |  1 +
 src/canopy/types.fs         |  1 +
 tests/basictests/Program.fs |  3 ++-
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/canopy/canopy.fs b/src/canopy/canopy.fs
index 517fe9e7..6b81364d 100644
--- a/src/canopy/canopy.fs
+++ b/src/canopy/canopy.fs
@@ -27,6 +27,7 @@ let aurora = FirefoxWithPath(@"C:\Program Files (x86)\Aurora\firefox.exe")
 let ie = IE
 let chrome = Chrome
 let phantomJS = PhantomJS
+let safari = Safari
 let phantomJSProxyNone = PhantomJSProxyNone
   
 let mutable browsers = []
@@ -660,6 +661,7 @@ let start b =
     //also download IEDriverServer and place in c:\ or configure with ieDir
     //firefox just works
     //for phantomjs download it and put in c:\ or configure with phantomJSDir
+    //for Safari download it and put in c:\ or configure with safariDir
        
     browser <-        
         match b with
@@ -677,6 +679,7 @@ let start b =
         | FirefoxWithProfile profile -> new FirefoxDriver(profile) :> IWebDriver
         | FirefoxWithPath path -> new FirefoxDriver(Firefox.FirefoxBinary(path), Firefox.FirefoxProfile()) :> IWebDriver
         | FirefoxWithUserAgent userAgent -> firefoxWithUserAgent userAgent
+        | Safari ->new Safari.SafariDriver() :> IWebDriver
         | PhantomJS -> 
             autoPinBrowserRightOnLaunch <- false
             new PhantomJS.PhantomJSDriver(phantomJSDir) :> IWebDriver
diff --git a/src/canopy/configuration.fs b/src/canopy/configuration.fs
index 4cbb988c..74ed24a6 100644
--- a/src/canopy/configuration.fs
+++ b/src/canopy/configuration.fs
@@ -2,13 +2,23 @@
 open reporters
 open System
 
+//location of drivers depending on OS
+let FolderByOSType = 
+    if System.Environment.OSVersion.Platform = PlatformID.MacOSX then
+        @"/usr/bin/"
+    elif  System.Environment.OSVersion.Platform = PlatformID.Unix then
+        @"/usr/bin/"
+    else
+        @"c:\"
+
 //runner related
 let failFast = ref false
 let mutable failScreenshotPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + @"\canopy\"
 
-let mutable chromeDir = @"c:\"
-let mutable ieDir = @"c:\"
-let mutable phantomJSDir = @"c:\"
+let mutable chromeDir = FolderByOSType
+let mutable ieDir = FolderByOSType
+let mutable phantomJSDir = FolderByOSType
+let mutable safariDir = FolderByOSType
 let mutable elementTimeout = 10.0
 let mutable compareTimeout = 10.0
 let mutable pageTimeout = 10.0
diff --git a/src/canopy/reporters.fs b/src/canopy/reporters.fs
index ce77e822..707803db 100644
--- a/src/canopy/reporters.fs
+++ b/src/canopy/reporters.fs
@@ -186,6 +186,7 @@ type LiveHtmlReporter(browser : BrowserStartMode, driverPath : string) =
         | FirefoxWithPath path -> new OpenQA.Selenium.Firefox.FirefoxDriver(Firefox.FirefoxBinary(path), Firefox.FirefoxProfile()) :> IWebDriver
         | ChromeWithUserAgent userAgent -> raise(System.Exception("Sorry ChromeWithUserAgent can't be used for LiveHtmlReporter"))
         | FirefoxWithUserAgent userAgent -> raise(System.Exception("Sorry FirefoxWithUserAgent can't be used for LiveHtmlReporter"))
+        | Safari -> new OpenQA.Selenium.Safari.SafariDriver() :> IWebDriver
         | PhantomJS | PhantomJSProxyNone -> raise(System.Exception("Sorry PhantomJS can't be used for LiveHtmlReporter"))
         | Remote(_,_) -> raise(System.Exception("Sorry Remote can't be used for LiveHtmlReporter"))
                 
diff --git a/src/canopy/types.fs b/src/canopy/types.fs
index 70e52941..cfed1f7c 100644
--- a/src/canopy/types.fs
+++ b/src/canopy/types.fs
@@ -46,6 +46,7 @@ type BrowserStartMode =
     | ChromeWithOptions of Chrome.ChromeOptions
     | ChromeWithOptionsAndTimeSpan of Chrome.ChromeOptions * TimeSpan
     | ChromeWithUserAgent of string
+    | Safari    
     | PhantomJS
     | PhantomJSProxyNone
     | Remote of string * ICapabilities
diff --git a/tests/basictests/Program.fs b/tests/basictests/Program.fs
index 27eceb3a..057f458c 100644
--- a/tests/basictests/Program.fs
+++ b/tests/basictests/Program.fs
@@ -8,7 +8,8 @@ open configuration
 open reporters
 open types
 
-start chrome
+//start chrome
+start Safari
 let mainBrowser = browser
 elementTimeout <- 3.0
 compareTimeout <- 3.0