doAssertRaises catch all

changelog.md

@@ -33,14 +33,14 @@
 
 - nodejs now supports osenv: `getEnv`, `putEnv`, `envPairs`, `delEnv`, `existsEnv`
 
-- `doAssertRaises` now correctly handles foreign exceptions.
+- `doAssertRaises` now correctly handles foreign exceptions;
+  it also allows a catch-all form that includes foreign exceptions.
 
 ## Language changes
 
 - `nimscript` now handles `except Exception as e`
-- The `cstring` doesn't support `[]=` operator in JS backend.
-
 
+- The `cstring` doesn't support `[]=` operator in JS backend.
 
 ## Compiler changes
 

lib/system/assertions.nim

@@ -109,3 +109,18 @@ template doAssertRaises*(exception: typedesc, code: untyped) =
     except: raisedForeign()
   if wrong:
     raiseAssert(begin & " nothing was raised" & msgEnd)
+
+template doAssertRaises*(code: untyped) =
+  ## Raises `AssertionDefect` if specified `code` does not raise anything,
+  ## including a foreign exception.
+  ## Example:
+  ##
+  ## .. code-block:: nim
+  ##  doAssertRaises: raise newException(ValueError, "Hello World")
+  var wrong = false
+  try:
+    if true: code
+    wrong = true
+  except: discard
+  if wrong:
+    raiseAssert("nothing was raised by: " & astToStr(code))