Merge branch 'master' into master

Author: adamdriscoll

README.md

@@ -10,6 +10,12 @@
 Install-Module Selenium
 ```
 
+OR
+
+```
+Import-Module "{FullPath}\selenium-powershell\Selenium.psm1"
+```
+
 # Usage
 
 ## Navigate to a URL
@@ -43,4 +49,18 @@ $Driver = Start-SeFirefox
 Enter-SeUrl https://www.poshud.com -Driver $Driver
 $Element = Find-SeElement -Driver $Driver -Id "txtEmail"
 Send-SeKeys -Element $Element -Keys "[email protected]"
+```
+
+## Run Chrome with options
+
+```powershell
+$Driver = Start-SeChrome -Arguments "headless","incognito" 
+```
+
+## Wait for an element
+```powershell
+$Driver = Start-SeChrome
+Enter-SeUrl https://www.google.com -Driver $Driver
+Wait-SeElementExists -Driver $Driver -Timeout 3 -Id "q"
+Wait-SeElementExists -Driver $Driver -Timeout 3 -Name "q"
 ```

Selenium.psd1

@@ -2,7 +2,33 @@
 [System.Reflection.Assembly]::LoadFrom("$PSScriptRoot\assemblies\WebDriver.Support.dll")
 
 function Start-SeChrome {
-    New-Object -TypeName "OpenQA.Selenium.Chrome.ChromeDriver"
+    Param(
+        [Parameter(Mandatory = $false)]
+        [array]$Arguments,
+        [switch]$HideVersionHint,
+        [System.IO.FileInfo]$DefaultDownloadPath,
+        [bool]$DisableBuiltInPDFViewer=$true
+    )
+
+    $Chrome_Options = New-Object -TypeName "OpenQA.Selenium.Chrome.ChromeOptions"
+    
+    if($DefaultDownloadPath){
+        Write-Host "Setting Default Download directory: $DefaultDownloadPath"
+        $Chrome_Options.AddUserProfilePreference('download', @{'default_directory' = $($DefaultDownloadPath.FullName); 'prompt_for_download' = $false; })
+    }
+    
+    if($DisableBuiltInPDFViewer){
+       $Chrome_Options.AddUserProfilePreference('plugins', @{'always_open_pdf_externally' =  $true;})
+    }
+    
+    if ($Arguments) {
+        $Chrome_Options.AddArguments($Arguments)
+    }
+    
+    if (!$HideVersionHint) {
+        Write-Host "Download the right chromedriver from 'http://chromedriver.chromium.org/downloads'" -ForegroundColor Yellow
+    }
+    New-Object -TypeName "OpenQA.Selenium.Chrome.ChromeDriver" -ArgumentList $Chrome_Options
 }
 
 function Start-SeIe {
@@ -45,6 +71,8 @@ function Find-SeElement {
         $Driver,
         [Parameter()]
         $Element,
+        [Parameter(ParameterSetName = "ByCss")]
+        $Css,
         [Parameter(ParameterSetName = "ByName")]
         $Name,
         [Parameter(ParameterSetName = "ById")]
@@ -53,10 +81,16 @@ function Find-SeElement {
         $ClassName,
         [Parameter(ParameterSetName = "ByLinkText")]
         $LinkText,
+        [Parameter(ParameterSetName = "ByPartialLinkText")]
+        $PartialLinkText,
         [Parameter(ParameterSetName = "ByTagName")]
         $TagName,
         [Parameter(ParameterSetName = "ByXPath")]
-        $XPath)
+        $XPath,
+        [Parameter(ParameterSetName = "ByCss")]
+        $Css
+        )
+
 
     Process {
 
@@ -85,6 +119,10 @@ function Find-SeElement {
             $Target.FindElements([OpenQA.Selenium.By]::LinkText($LinkText))
         }
 
+        if ($PSCmdlet.ParameterSetName -eq "ByPartialLinkText") {
+            $Target.FindElements([OpenQA.Selenium.By]::PartialLinkText($PartialLinkText))
+        }
+
         if ($PSCmdlet.ParameterSetName -eq "ByClassName") {
             $Target.FindElements([OpenQA.Selenium.By]::ClassName($ClassName))
         }
@@ -96,6 +134,10 @@ function Find-SeElement {
         if ($PSCmdlet.ParameterSetName -eq "ByXPath") {
             $Target.FindElements([OpenQA.Selenium.By]::XPath($XPath))
         }
+        
+        if ($PSCmdlet.ParameterSetName -eq "ByCss") {
+            $Target.FindElements([OpenQA.Selenium.By]::CssSelector($Css))
+        }
     }
 }
 
@@ -107,19 +149,29 @@ function Invoke-SeClick {
         [Switch]$JavaScriptClick,
         [Parameter()]
         $Driver
-        )
+    )
 
     if ($JavaScriptClick) {
         $Driver.ExecuteScript("arguments[0].click()", $Element)
-    } else {
+    }
+    else {
         $Element.Click()
     }
 
 }
 
+function Get-SeKeys {
+    
+    [OpenQA.Selenium.Keys] | Get-Member -MemberType Property -Static | Select-Object -Property Name, @{N = "ObjectString"; E = { "[OpenQA.Selenium.Keys]::$($_.Name)" } }
+}
+
 function Send-SeKeys {
     param([OpenQA.Selenium.IWebElement]$Element, [string]$Keys)
-
+    
+    foreach ($Key in @(Get-SeKeys).Name) {
+        $Keys = $Keys -replace "{{$Key}}", [OpenQA.Selenium.Keys]::$Key
+    }
+    
     $Element.SendKeys($Keys)
 }
 
@@ -138,16 +190,16 @@ function Remove-SeCookie {
 function Set-SeCookie {
     param($Driver, $name, $value)
 
-    $cookie = New-Object -TypeName OpenQA.Selenium.Cookie -ArgumentList $Name,$value
+    $cookie = New-Object -TypeName OpenQA.Selenium.Cookie -ArgumentList $Name, $value
 
     $Driver.Manage().Cookies.AddCookie($cookie)
 }
 
 function Get-SeElementAttribute {
     param(
-        [Parameter(ValueFromPipeline=$true, Mandatory = $true)]
+        [Parameter(ValueFromPipeline = $true, Mandatory = $true)]
         [OpenQA.Selenium.IWebElement]$Element,
-        [Parameter(Mandatory=$true)]
+        [Parameter(Mandatory = $true)]
         [string]$Attribute
     )
 
@@ -160,9 +212,12 @@ function Invoke-SeScreenshot {
     param($Driver, [Switch]$AsBase64EncodedString)
 
     $Screenshot = [OpenQA.Selenium.Support.Extensions.WebDriverExtensions]::TakeScreenshot($Driver)
-    if ($AsBase64String) {
+    if ($AsBase64EncodedString) {
         $Screenshot.AsBase64EncodedString
     }
+    else {
+        $Screenshot
+    }
 }
 
 function Save-SeScreenshot {
@@ -174,7 +229,42 @@ function Save-SeScreenshot {
         [Parameter()]
         [OpenQA.Selenium.ScreenshotImageFormat]$ImageFormat = [OpenQA.Selenium.ScreenshotImageFormat]::Png)
 
-        Process {
-            $Screenshot.SaveAsFile($Path, $ImageFormat)
-        }
+    Process {
+        $Screenshot.SaveAsFile($Path, $ImageFormat)
+    }
+}
+
+function Wait-SeElementExists{
+    param(
+        $Driver,
+        $Timeout = 30,
+        $Id,
+        $Name,
+        $TagName,
+        $ClassName
+    )
+    if ($Id) {
+        $TargetElement = [OpenQA.Selenium.By]::Id($Id)
+    }
+    elseif ($Name) {
+        $TargetElement = [OpenQA.Selenium.By]::Name($Name)
+    }
+    elseif($TagName)
+    {
+        $TargetElement = [OpenQA.Selenium.By]::TagName($TagName)
+    }
+    elseif($ClassName)
+    {
+        $TargetElement = [OpenQA.Selenium.By]::ClassName($ClassName)
+    }
+    else
+    {
+        throw "Please specify -Id or -Name or -TagName or -ClassName"
+    }
+
+    $WebDriverWait = New-Object -TypeName OpenQA.Selenium.Support.UI.WebDriverWait($Driver, (New-TimeSpan -Seconds $Timeout))
+    $Condition = [OpenQA.Selenium.Support.UI.ExpectedConditions]::ElementExists($TargetElement)
+    $WebDriverWait.Until($Condition)
 }
+
+

Selenium.psm1

@@ -1,10 +1,23 @@
 Import-Module (Join-Path $PSScriptRoot "Selenium.psm1")
 
 Describe "Get-SeCookie" {
+    $Driver = Start-SeFirefox
     Context "Should get cookies from google" {
-        $Driver = Start-SeFirefox
         Enter-SeUrl -Driver $Driver -Url "http://www.google.com"
 
         Get-SeCookie $Driver
     }
+    Stop-SeDriver $Driver
+}
+
+Describe "Send-SeKeys" {
+    $Driver = Start-SeFirefox
+    Enter-SeUrl -Driver $Driver -Url "http://www.google.com"
+    Context "Find-SeElement" {
+        It "By Css" {
+            $SearchInput = Find-SeElement -Driver $Driver -Css "input[name='q']"
+            Send-SeKeys -Element $SearchInput -Keys "test"
+        }
+    }
+    Stop-SeDriver $Driver
 }