#25: adds new Wait-MonocleElement

Badgerati · Feb 4, 2020 · 0f79186 · 0f79186
1 parent f9ebc51
commit 0f79186
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 7 deletions.
diff --git a/examples/youtube.ps1 b/examples/youtube.ps1
@@ -1,7 +1,7 @@
-#$path = Split-Path -Parent -Path (Split-Path -Parent -Path $MyInvocation.MyCommand.Path)
-#$path = "$($path)/src/Monocle.psm1"
-#Import-Module $path -Force -ErrorAction Stop
-Import-Module -Name Monocle -Force -ErrorAction Stop
+$path = Split-Path -Parent -Path (Split-Path -Parent -Path $MyInvocation.MyCommand.Path)
+$path = "$($path)/src/Monocle.psm1"
+Import-Module $path -Force -ErrorAction Stop
+#Import-Module -Name Monocle -Force -ErrorAction Stop
 
 # Create a browser object
 $browser = New-MonocleBrowser -Type Chrome
@@ -17,6 +17,7 @@ Start-MonocleFlow -Name 'Load YouTube' -Browser $browser -ScriptBlock {
     Get-MonocleElement -Id 'search_query' | Set-MonocleElementValue -Value 'Beerus Madness (Extended)'
 
     # Tells the browser to click the search button
+    Wait-MonocleElement -Id 'search-icon-legacy'
     Get-MonocleElement -Id 'search-icon-legacy' | Invoke-MonocleElementClick
 
     # Though all commands sleep when the page is busy, some buttons use javascript

diff --git a/src/Monocle.psd1 b/src/Monocle.psd1
@@ -11,7 +11,7 @@
     RootModule = 'Monocle.psm1'
 
     # Version number of this module.
-    ModuleVersion = '1.1.2'
+    ModuleVersion = '1.2.0'
 
     # ID used to uniquely identify this module
     GUID = '9dc3c8a1-664d-4253-a5d2-920250d3a15f'

diff --git a/src/Private/Elements.ps1 b/src/Private/Elements.ps1
@@ -59,11 +59,18 @@ function Get-MonocleElementInternal
         [string]
         $XPath,
 
+        [Parameter()]
+        [int]
+        $Timeout = 0,
+
         [switch]
         $NoThrow
     )
 
-    $timeout = Get-MonocleTimeout
+    if ($Timeout -le 0) {
+        $Timeout = Get-MonocleTimeout
+    }
+
     $seconds = 0
 
     while ($true) {
@@ -90,7 +97,7 @@ function Get-MonocleElementInternal
         catch {
             $seconds++
 
-            if ($seconds -ge $timeout) {
+            if ($seconds -ge $Timeout) {
                 throw $_.Exception
             }
 

diff --git a/src/Public/Elements.ps1 b/src/Public/Elements.ps1
@@ -212,6 +212,50 @@ function Test-MonocleElement
     return (($null -ne $result) -and ($null -ne $result.Element))
 }
 
+function Wait-MonocleElement
+{
+    [CmdletBinding(DefaultParameterSetName='Id')]
+    param (
+        [Parameter(Mandatory=$true, ParameterSetName='Id')]
+        [string]
+        $Id,
+
+        [Parameter(Mandatory=$true, ParameterSetName='Tag')]
+        [string]
+        $TagName,
+
+        [Parameter(ParameterSetName='Tag')]
+        [string]
+        $AttributeName,
+
+        [Parameter(ParameterSetName='Tag')]
+        [string]
+        $AttributeValue,
+
+        [Parameter(ParameterSetName='Tag')]
+        [string]
+        $ElementValue,
+
+        [Parameter(ParameterSetName='XPath')]
+        [string]
+        $XPath,
+
+        [Parameter()]
+        [int]
+        $Timeout = 600
+    )
+
+    Get-MonocleElementInternal `
+        -FilterType $PSCmdlet.ParameterSetName `
+        -Id $Id `
+        -TagName $TagName `
+        -AttributeName $AttributeName `
+        -AttributeValue $AttributeValue `
+        -ElementValue $ElementValue `
+        -XPath $XPath `
+        -Timeout $Timeout | Out-Null
+}
+
 function Get-MonocleElement
 {
     [CmdletBinding(DefaultParameterSetName='Id')]