Fix error messsage of Should Throw when null input is provided

heaths · Apr 24, 2016 · 138bf62 · 138bf62
1 parent d9bd6d5
commit 138bf62
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/Functions/Assertions/PesterThrow.Tests.ps1 b/Functions/Assertions/PesterThrow.Tests.ps1
@@ -24,6 +24,16 @@ InModuleScope Pester {
         It "returns true if the statement throws an exception and the actual error text matches the expected error pattern" {
             Test-PositiveAssertion (PesterThrow { throw "expected error"} "error")
         }
+
+        It "throws ArgumentException if null ScriptBlock is provided" {
+            try {
+                Test-PositiveAssertion (PesterThrow $null)
+                throw "Should throw exception, but no exception was thrown."
+            }
+            catch [ArgumentException] {
+                #do nothing. we expect argument exception to happen
+            }
+        }
     }
 
     Describe "Get-DoMessagesMatch" {

diff --git a/Functions/Assertions/PesterThrow.ps1 b/Functions/Assertions/PesterThrow.ps1
@@ -5,6 +5,11 @@ $ActualExceptionWasThrown = $false
 # because this is a script block, the user will have to
 # wrap the code they want to assert on in { }
 function PesterThrow([scriptblock] $script, $expectedErrorMessage) {
+
+    if ($null -eq $script) {
+        throw (New-Object -TypeName ArgumentNullException -ArgumentList "script","Scriptblock not found. Input to 'Throw' and 'Not Throw' must be enclosed in curly braces.")
+    }
+
     $Script:ActualExceptionMessage = ""
     $Script:ActualExceptionWasThrown = $false