Merge branch 'master' into master

Author: adamdriscoll

Selenium.psm1

@@ -10,18 +10,21 @@ function Start-SeChrome {
     )
 
     $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) {
+    
+    if ($Arguments) {
         $Chrome_Options.AddArguments($Arguments)
     }
-    if(!$HideVersionHint)
-    {
+    
+    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
@@ -63,6 +66,8 @@ function Find-SeElement {
         $Driver,
         [Parameter()]
         $Element,
+        [Parameter(ParameterSetName = "ByCss")]
+        $Css,
         [Parameter(ParameterSetName = "ByName")]
         $Name,
         [Parameter(ParameterSetName = "ById")]
@@ -124,7 +129,7 @@ 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))
         }
@@ -139,11 +144,12 @@ function Invoke-SeClick {
         [Switch]$JavaScriptClick,
         [Parameter()]
         $Driver
-        )
+    )
 
     if ($JavaScriptClick) {
         $Driver.ExecuteScript("arguments[0].click()", $Element)
-    } else {
+    }
+    else {
         $Element.Click()
     }
 
@@ -152,16 +158,16 @@ function Invoke-SeClick {
 
 function Get-SeKeys {
 
-    [OpenQA.Selenium.Keys] | Get-Member -MemberType Property -Static | Select-Object -Property Name,@{N = "ObjectString"; E = {"[OpenQA.Selenium.Keys]::$($_.Name)"}}
+    [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)
-    {
+    foreach ($Key in @(Get-SeKeys).Name) {
         $Keys = $Keys -replace "{{$Key}}", [OpenQA.Selenium.Keys]::$Key
     }
+    
     $Element.SendKeys($Keys)
 }
 
@@ -180,16 +186,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
     )
 
@@ -204,7 +210,8 @@ function Invoke-SeScreenshot {
     $Screenshot = [OpenQA.Selenium.Support.Extensions.WebDriverExtensions]::TakeScreenshot($Driver)
     if ($AsBase64EncodedString) {
         $Screenshot.AsBase64EncodedString
-    } else {
+    }
+    else {
         $Screenshot
     }
 }
@@ -218,9 +225,9 @@ 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{
@@ -232,12 +239,10 @@ function Wait-SeElementExists{
         $TagName,
         $ClassName
     )
-    if($Id)
-    {
+    if ($Id) {
         $TargetElement = [OpenQA.Selenium.By]::Id($Id)
     }
-    elseif($Name)
-    {
+    elseif ($Name) {
         $TargetElement = [OpenQA.Selenium.By]::Name($Name)
     }
     elseif($TagName)

Selenium.tests.ps1

@@ -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
 }