riot 0.9.9 → 0.9.10

data/VERSION

@@ -1 +1 @@
-0.9.9
+0.9.10

data/lib/riot/assertion_macros.rb

@@ -36,9 +36,11 @@ module Riot
     def raises(expected, expected_message=nil)
       actual_error = raised.original_exception
       @raised = nil
-      return fail("should have raised #{expected}, but raised nothing") unless actual_error
-      return fail("should have raised #{expected}, not #{error.class}") unless expected == actual_error.class
-      if expected_message && !(actual_error.message.to_s =~ %r[#{expected_message}])
+      if actual_error.nil?
+        return fail("should have raised #{expected}, but raised nothing")
+      elsif expected != actual_error.class
+        return fail("should have raised #{expected}, not #{actual_error.class}")
+      elsif expected_message && !(actual_error.message.to_s =~ %r[#{expected_message}])
         return fail("expected #{expected_message} for message, not #{actual_error.message}")
       end
       true

data/riot.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{riot}
-  s.version = "0.9.9"
+  s.version = "0.9.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin 'Gus' Knowlden"]

data/test/assertion_macros/assertion_macro_raises_test.rb

@@ -1,10 +1,16 @@
 require 'teststrap'
 
+class MyException < Exception; end
+
 context "raises assertion:" do
   setup { Riot::Situation.new }
 
   should("raise an Exception") { raise Exception }.raises(Exception)
 
+  should "fail if Exception classes do not match" do
+    Riot::Assertion.new("foo", topic) { raise MyException }.raises(Exception)
+  end.kind_of(Riot::Failure)
+
   should "pass if provided message equals expectation" do
     Riot::Assertion.new("foo", topic) { raise Exception, "I'm a nerd" }.raises(Exception, "I'm a nerd")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: riot
 version: !ruby/object:Gem::Version 
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors: 
 - Justin 'Gus' Knowlden