matest 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a20475ba5064a302ebc0c15c66b89d1397aca7cd
-  data.tar.gz: 44348821c95ddb0fc69359db9bcac993f31e1eb9
+  metadata.gz: 2448b223b54086b961d6c5b96130d1296ff55508
+  data.tar.gz: 10a0a8830bfacb9c6db403704f821534ba3e7a1d
 SHA512:
-  metadata.gz: b3280a9e1c7067cfbf03ffa82ca7c7eabe51e7b5c348e399320564d60beb3686bafb0bc39f61ea983b8f6ffd33d615dea0adbafd78daaf4234c1d864c28bdfc7
-  data.tar.gz: ab3739128bdf8f4a53741af7c6d3e1b8ac1749b005996e424b3535e42c6108d8ec9c956661199d8c7e251620fe148362fa5fd777fa2343e195a3aaec6dfbff66
+  metadata.gz: 1ebda59e621cd3450c615a4b0c1ed141f562fd1181ce46c6315371f86dbda5085225a1e85efa9d65561a008570fc8923411604144d443107c89b3159b4f734c2
+  data.tar.gz: cd3213ab23b35c487b730fd127af012b707d5a85122a4a4df2e38f28747ea8cb7e0dc98311d4321d01eaac3b1c89e7cc06f6e48125265862e19c2e9675c37042

data/lib/matest/capture_exception.rb

@@ -1,14 +1,23 @@
-class NoExceptionRaised < RuntimeError; end
-class UnexpectedExceptionRaised < RuntimeError; end
+module Matest
+  class NoExceptionRaised < RuntimeError; end
+  class UnexpectedExceptionRaised < RuntimeError; end
 
-def capture_exception(exception_class=BasicObject, &block)
-  begin
-    block.call
-    raise NoExceptionRaised.new
-    false
-  rescue exception_class => e
-    e
-  rescue BasicObject => e
-    raise UnexpectedExceptionRaised.new
+  def capture_exception(exception_class=nil, &block)
+    expected_exception = exception_class || BasicObject
+    begin
+      block.call
+      if exception_class
+        raise Matest::NoExceptionRaised.new("Expected '#{exception_class.inspect}' from the block, but none was raised.")
+      else
+        raise Matest::NoExceptionRaised.new("Expected an Exception from the block, but none was raised.")
+      end
+      false
+    rescue Matest::NoExceptionRaised => e
+      raise e
+    rescue expected_exception => e
+      e
+    rescue BasicObject => e
+      raise e
+    end
   end
 end

data/lib/matest/version.rb

@@ -1,3 +1,3 @@
 module Matest
-  VERSION = "1.5.3"
+  VERSION = "1.5.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: matest
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Federico Iachetti