Merge pull request #27 from fflaten/fflaten-patch-1

Update advanced function test

Author: TechDufus

Functions/Public/TimeStamp.ps1

@@ -49,9 +49,6 @@ Function TimeStamp() {
         on this GitHub project at https://github.com/TechDufus/AdminToolkit
 #>
 Filter TimeStamp($color, $NoNewLine) {
-    # [CmdletBinding()] # This is to pass the advanced function pester tests.
-    # param () # This is to pass the advanced function pester tests.
-    # Function # This is to pass the advanced function pester tests.
     if ($color -eq 'NoNewLine') {
         $color = 'White'
         $NoNewLine = 'NoNewLine'

Functions/Public/grep.ps1

@@ -31,7 +31,6 @@ If ($DetectedOS -eq 'Windows') {
             on this GitHub project at https://github.com/TechDufus/AdminToolkit
     #>
     Function grep() {
-        # [CmdletBinding()] # This is to pass the advanced function pester tests.
         param(
             $regex
         )

Tests/Functions/Public/AdminToolkit_PublicFunctions_Universal.Tests.ps1

@@ -29,7 +29,8 @@ BeforeDiscovery {
 
 Describe "Function: <_.BaseName>" -ForEach $PublicFunctions {
     BeforeDiscovery {
-        $Parameters = ((Get-Command $_.BaseName -ErrorAction SilentlyContinue).Parameters).Keys 
+        $Command = Get-Command $_.BaseName -ErrorAction SilentlyContinue
+        $Parameters = $Command.Parameters.Keys 
             | Where-Object { 
                 $_ -notin ([System.Management.Automation.PSCmdlet]::CommonParameters) -and 
                 $_ -notin ([System.Management.Automation.PSCmdlet]::OptionalCommonParameters) 
@@ -50,8 +51,8 @@ Describe "Function: <_.BaseName>" -ForEach $PublicFunctions {
         }
     }
 
-    It "Should register command with Get-Command" {
-        (Get-Command $CurrentFunction.BaseName) | Should -BeOfType [System.Management.Automation.CommandInfo]
+    It "Should register command with Get-Command" -ForEach @{ Command = $Command } {
+        $Command | Should -BeOfType [System.Management.Automation.CommandInfo]
     }
     It "Should have comment-based help block" {
         $CurrentFunction.FullName | Should -FileContentMatch '<#'
@@ -69,10 +70,8 @@ Describe "Function: <_.BaseName>" -ForEach $PublicFunctions {
     It "Should have NOTES section in help" {
         $CurrentFunction.FullName | Should -FileContentMatch '.NOTES'
     }
-    It "Should be an advanced function" {
-        $CurrentFunction.FullName | Should -FileContentMatch 'function'
-        $CurrentFunction.FullName | Should -FileContentMatch 'cmdletbinding'
-        $CurrentFunction.FullName | Should -FileContentMatch 'param'
+    It 'Should be an advanced function' -Skip:($Command.CommandType -ne 'Function' -or $Command.Name -in 'grep') -ForEach @{ Command = $Command } {
+        $Command.CmdletBinding | Should -BeTrue
     }
     It "Should have Begin and End Regions" {
         $CurrentFunction.FullName | Should -FileContentMatch "#Region"