lib/assay/assertions/throw_failure.rb in assay-0.2.0 vs lib/assay/assertions/throw_failure.rb in assay-0.3.0

@@ -58,10 +58,11 @@
       pass
     end
 
     #
     def to_s
+      return @mesg if @mesg
       return super unless @arguments.size == 1
 
       sym = @arguments[0].inspect
 
       if @_negated
@@ -79,23 +80,21 @@
     #
     #   assert_throws :done do
     #     throw :done
     #   end
     #
-    def assert_throws(sym, opts={}, &blk)
-      opts[:backtrace] ||= caller
-      ThrowFailure.assert(sym, opts, &blk)
+    def assert_throws(sym, msg=nil, &blk)
+      ThrowFailure.assert(sym, :message=>msg, :backtrace=>caller, &blk)
     end
 
     # Passes if the block throws expected_symbol
     #
     #   refute_throws :done do
     #     throw :chimp
     #   end
     #
-    def refute_throws(sym, opts={}, &blk)
-      opts[:backtrace] ||= caller
-      ThrowFailure.refute(sym, opts, &blk)
+    def refute_throws(sym, msg=nil, &blk)
+      ThrowFailure.refute(sym, :message=>msg, :backtrace=>caller, &blk)
     end
 
     alias_method :assert_not_thrown, :refute_throws
   end