Added support for user-controlled remote WebDriver services, PhantomJ…

…S via Selenium, updated to Se 2.34
stirno · Aug 9, 2013 · e961f27 · e961f27
1 parent acdc139
commit e961f27
Show file tree

Hide file tree

Showing 13 changed files with 166 additions and 14 deletions.
diff --git a/FluentAutomation.SeleniumWebDriver/3rdPartyLib/IEDriverServer.exe b/FluentAutomation.SeleniumWebDriver/3rdPartyLib/IEDriverServer.exe
diff --git a/FluentAutomation.SeleniumWebDriver/3rdPartyLib/IEDriverServer32.exe b/FluentAutomation.SeleniumWebDriver/3rdPartyLib/IEDriverServer32.exe
diff --git a/FluentAutomation.SeleniumWebDriver/3rdPartyLib/IEDriverServer64.exe b/FluentAutomation.SeleniumWebDriver/3rdPartyLib/IEDriverServer64.exe
diff --git a/FluentAutomation.SeleniumWebDriver/3rdPartyLib/chromedriver.exe b/FluentAutomation.SeleniumWebDriver/3rdPartyLib/chromedriver.exe
diff --git a/FluentAutomation.SeleniumWebDriver/3rdPartyLib/phantomjs.exe b/FluentAutomation.SeleniumWebDriver/3rdPartyLib/phantomjs.exe
diff --git a/FluentAutomation.SeleniumWebDriver/FluentAutomation.SeleniumWebDriver.csproj b/FluentAutomation.SeleniumWebDriver/FluentAutomation.SeleniumWebDriver.csproj
@@ -47,13 +47,13 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="WebDriver, Version=2.33.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="WebDriver, Version=2.34.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Selenium.WebDriver.2.33.0\lib\net40\WebDriver.dll</HintPath>
+      <HintPath>..\packages\Selenium.WebDriver.2.34.0\lib\net40\WebDriver.dll</HintPath>
     </Reference>
-    <Reference Include="WebDriver.Support, Version=2.33.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="WebDriver.Support, Version=2.34.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Selenium.Support.2.33.0\lib\net40\WebDriver.Support.dll</HintPath>
+      <HintPath>..\packages\Selenium.Support.2.34.0\lib\net40\WebDriver.Support.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -79,7 +79,13 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="3rdPartyLib\chromedriver.exe" />
-    <EmbeddedResource Include="3rdPartyLib\IEDriverServer.exe" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="3rdPartyLib\IEDriverServer32.exe" />
+    <EmbeddedResource Include="3rdPartyLib\IEDriverServer64.exe" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="3rdPartyLib\phantomjs.exe" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />

diff --git a/FluentAutomation.SeleniumWebDriver/SeleniumWebDriver.cs b/FluentAutomation.SeleniumWebDriver/SeleniumWebDriver.cs
@@ -6,6 +6,7 @@
 using System.Threading.Tasks;
 using FluentAutomation.Interfaces;
 using OpenQA.Selenium;
+using OpenQA.Selenium.Remote;
 
 namespace FluentAutomation
 {
@@ -24,15 +25,25 @@ public enum Browser
             /// </summary>
             InternetExplorer = 1,
 
+            /// <summary>
+            /// Internet Explorer (64-bit). Before using, make sure to set ProtectedMode settings to be the same for all zones.
+            /// </summary>
+            InternetExplorer64 = 2,
+
             /// <summary>
             /// Mozilla Firefox
             /// </summary>
-            Firefox = 2,
+            Firefox = 3,
 
             /// <summary>
             /// Google Chrome
             /// </summary>
-            Chrome = 4
+            Chrome = 4,
+
+            /// <summary>
+            /// PhantomJS - Headless browser - Support is Experimental
+            /// </summary>
+            PhantomJs = 5
         }
 
         /// <summary>
@@ -65,7 +76,11 @@ public static void Bootstrap(Browser browser)
                 switch (SeleniumWebDriver.SelectedBrowser)
                 {
                     case Browser.InternetExplorer:
-                        EmbeddedResources.UnpackFromAssembly("IEDriverServer.exe", Assembly.GetAssembly(typeof(SeleniumWebDriver)));
+                        EmbeddedResources.UnpackFromAssembly("IEDriverServer32.exe", "IEDriverServer.exe", Assembly.GetAssembly(typeof(SeleniumWebDriver)));
+                        container.Register<IWebDriver, Wrappers.IEDriverWrapper>().AsMultiInstance();
+                        break;
+                    case Browser.InternetExplorer64:
+                        EmbeddedResources.UnpackFromAssembly("IEDriverServer64.exe", "IEDriverServer.exe", Assembly.GetAssembly(typeof(SeleniumWebDriver)));
                         container.Register<IWebDriver, Wrappers.IEDriverWrapper>().AsMultiInstance();
                         break;
                     case Browser.Firefox:
@@ -75,7 +90,97 @@ public static void Bootstrap(Browser browser)
                         EmbeddedResources.UnpackFromAssembly("chromedriver.exe", Assembly.GetAssembly(typeof(SeleniumWebDriver)));
                         container.Register<IWebDriver, OpenQA.Selenium.Chrome.ChromeDriver>().AsMultiInstance();
                         break;
+                    case Browser.PhantomJs:
+                        EmbeddedResources.UnpackFromAssembly("phantomjs.exe", Assembly.GetAssembly(typeof(SeleniumWebDriver)));
+                        container.Register<IWebDriver, OpenQA.Selenium.PhantomJS.PhantomJSDriver>().AsMultiInstance();
+                        break;
+                }
+            };
+        }
+
+        /// <summary>
+        /// Bootstrap Selenium provider using a Remote web driver targetting the requested browser
+        /// </summary>
+        /// <param name="driverUri"></param>
+        /// <param name="capabilities"></param>
+        public static void Bootstrap(Uri driverUri, Browser browser)
+        {
+            SeleniumWebDriver.SelectedBrowser = browser;
+
+            FluentAutomation.Settings.Registration = (container) =>
+            {
+                container.Register<ICommandProvider, CommandProvider>();
+                container.Register<IExpectProvider, ExpectProvider>();
+                container.Register<IFileStoreProvider, LocalFileStoreProvider>();
+
+                DesiredCapabilities browserCapabilities = null;
+
+                switch (SeleniumWebDriver.SelectedBrowser)
+                {
+                    case Browser.InternetExplorer:
+                    case Browser.InternetExplorer64:
+                        browserCapabilities = DesiredCapabilities.InternetExplorer();
+                        break;
+                    case Browser.Firefox:
+                        browserCapabilities = DesiredCapabilities.Firefox();
+                        break;
+                    case Browser.Chrome:
+                        browserCapabilities = DesiredCapabilities.Chrome();
+                        break;
+                    case Browser.PhantomJs:
+                        browserCapabilities = DesiredCapabilities.PhantomJS();
+                        break;
+                }
+
+                container.Register<IWebDriver, RemoteWebDriver>(new RemoteWebDriver(driverUri, browserCapabilities));
+            };
+        }
+
+        /// <summary>
+        /// Bootstrap Selenium provider using a Remote web driver service with the requested capabilities
+        /// </summary>
+        /// <param name="driverUri"></param>
+        /// <param name="capabilities"></param>
+        public static void Bootstrap(Uri driverUri, Dictionary<string, object> capabilities)
+        {
+            FluentAutomation.Settings.Registration = (container) =>
+            {
+                container.Register<ICommandProvider, CommandProvider>();
+                container.Register<IExpectProvider, ExpectProvider>();
+                container.Register<IFileStoreProvider, LocalFileStoreProvider>();
+
+                DesiredCapabilities browserCapabilities = null;
+
+                switch (SeleniumWebDriver.SelectedBrowser)
+                {
+                    case Browser.InternetExplorer:
+                    case Browser.InternetExplorer64:
+                        browserCapabilities = DesiredCapabilities.InternetExplorer();
+                        break;
+                    case Browser.Firefox:
+                        browserCapabilities = DesiredCapabilities.Firefox();
+                        break;
+                    case Browser.Chrome:
+                        browserCapabilities = DesiredCapabilities.Chrome();
+                        break;
+                    case Browser.PhantomJs:
+                        browserCapabilities = DesiredCapabilities.PhantomJS();
+                        break;
+                }
+
+                if (browserCapabilities == null)
+                {
+                    browserCapabilities = new DesiredCapabilities(capabilities);
+                }
+                else
+                {
+                    foreach (var cap in capabilities)
+                    {
+                        browserCapabilities.SetCapability(cap.Key, cap.Value);
+                    }
                 }
+
+                container.Register<IWebDriver, RemoteWebDriver>(new RemoteWebDriver(driverUri, browserCapabilities));
             };
         }
     }

diff --git a/FluentAutomation.SeleniumWebDriver/packages.config b/FluentAutomation.SeleniumWebDriver/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Newtonsoft.Json" version="5.0.5" targetFramework="net40" />
-  <package id="Selenium.Support" version="2.33.0" targetFramework="net40" />
-  <package id="Selenium.WebDriver" version="2.33.0" targetFramework="net40" />
+  <package id="Selenium.Support" version="2.34.0" targetFramework="net40" />
+  <package id="Selenium.WebDriver" version="2.34.0" targetFramework="net40" />
 </packages>
diff --git a/FluentAutomation.Tests/FluentAutomation.Tests.csproj b/FluentAutomation.Tests/FluentAutomation.Tests.csproj
@@ -60,6 +60,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Native\WatiN.cs" />
     <Compile Include="Remote\Node.cs" />
+    <Compile Include="Remote\RemoteTest.cs" />
     <Compile Include="WaitUntilTests.cs" />
   </ItemGroup>
   <ItemGroup>

diff --git a/FluentAutomation.Tests/Native/SeleniumChrome.cs b/FluentAutomation.Tests/Native/SeleniumChrome.cs
@@ -10,7 +10,7 @@ public class SeleniumChrome : RepeatableNativeTest
     {
         public SeleniumChrome()
         {
-            FluentAutomation.SeleniumWebDriver.Bootstrap(SeleniumWebDriver.Browser.Chrome);
+            FluentAutomation.SeleniumWebDriver.Bootstrap(SeleniumWebDriver.Browser.PhantomJs);
         }
 
         [Fact]

diff --git a/FluentAutomation.Tests/Remote/RemoteTest.cs b/FluentAutomation.Tests/Remote/RemoteTest.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Xunit;
+
+namespace FluentAutomation.Tests.Remote
+{
+    public class RemoteTest : FluentTest
+    {
+        public RemoteTest()
+        {
+            FluentAutomation.SeleniumWebDriver.Bootstrap(new Uri("http://localhost:9515"), SeleniumWebDriver.Browser.Chrome);
+        }
+
+        [Fact]
+        public void TestOp()
+        {
+            I.Open("http://www.bing.com");
+        }
+    }
+}
diff --git a/FluentAutomation/EmbeddedResources.cs b/FluentAutomation/EmbeddedResources.cs
@@ -9,16 +9,34 @@ namespace FluentAutomation
 {
     public static class EmbeddedResources
     {
+        public static string WorkingDirectory
+        {
+            get
+            {
+                var execAssembly = Assembly.GetExecutingAssembly();
+                var dirBasePath = Path.GetDirectoryName(AppDomain.CurrentDomain.ShadowCopyFiles ? execAssembly.CodeBase : execAssembly.Location);
+
+                return new Uri(dirBasePath).LocalPath;
+            }
+        }
+
         public static void UnpackFromAssembly(string resourceFileName, Assembly assembly)
+        {
+            UnpackFromAssembly(resourceFileName, resourceFileName, assembly);
+        }
+
+        public static void UnpackFromAssembly(string resourceFileName, string outputFileName, Assembly assembly)
         {
             var resourceName = assembly.GetManifestResourceNames().FirstOrDefault(x => x.EndsWith(resourceFileName));
-            if (!File.Exists(resourceFileName))
+            var outputName = Path.Combine(WorkingDirectory, outputFileName);
+
+            if (!File.Exists(outputName))
             {
                 var resourceStream = assembly.GetManifestResourceStream(resourceName);
                 var resourceBytes = new byte[(int)resourceStream.Length];
 
                 resourceStream.Read(resourceBytes, 0, resourceBytes.Length);
-                File.WriteAllBytes(resourceFileName, resourceBytes);
+                File.WriteAllBytes(outputName, resourceBytes);
             }
         }
     }

diff --git a/FluentAutomation/Properties/AssemblyGlobal.cs b/FluentAutomation/Properties/AssemblyGlobal.cs
@@ -9,4 +9,4 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("2.0.0.2")]
+[assembly: AssemblyVersion("2.1.0.0")]
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ public class SeleniumChrome : RepeatableNativeTest @@
         {
             public SeleniumChrome()
             {
-                FluentAutomation.SeleniumWebDriver.Bootstrap(SeleniumWebDriver.Browser.Chrome);
+                FluentAutomation.SeleniumWebDriver.Bootstrap(SeleniumWebDriver.Browser.PhantomJs);
             }
             [Fact]
@@ Expand Down @@