riot 0.9.0 → 0.9.1

data/README.markdown

@@ -115,6 +115,13 @@ Sometimes, your test raises an exception that you actually expected.
       asserts("invalid data") { @user.save! }.raises(ActiveRecord::RecordInvalid)
     end
 
+And if you wanted to check that the exception and message match what you expect:
+
+    context "a new user" do
+      setup { @user = User.new }
+      asserts("invalid data") { @user.save! }.raises(ActiveRecord::RecordInvalid, /has errors/)
+    end
+
 #### Example: Kind Of
 
 When you want to test that an expression returns an object of an expected type:

data/lib/riot/assertion.rb

@@ -23,7 +23,7 @@ module Riot
   private
     def actualize(situation, &block)
       @actual = situation.instance_eval(&block)
-      @default_failure = fail("expected true, not #{@actual.inspect}") unless @actual
+      @default_failure = fail("expected true, not #{@actual.inspect}") unless @actual == true
     rescue Exception => e
       @raised = e
     end

data/lib/riot/macros.rb

@@ -17,10 +17,17 @@ module Riot
     # Asserts that the test raises the expected Exception
     #   asserts("test") { raise My::Exception }.raises(My::Exception)
     #   should("test") { raise My::Exception }.raises(My::Exception)
-    def raises(expected)
-      fail("should have raised #{expected}, but raised nothing") unless raised
-      fail("should have raised #{expected}, not #{error.class}") unless expected == raised.class
+    #   asserts("test") { raise My::Exception, "Foo" }.raises(My::Exception, "Foo")
+    #   asserts("test") { raise My::Exception, "Foo Bar" }.raises(My::Exception, /Bar/)
+    def raises(expected, expected_message=nil)
+      actual_error = raised
       @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 =~ %r[#{expected_message}])
+        return fail("expected #{expected_message} for message, not #{actual_error.message}")
+      end
+      true
     end
 
     # Asserts that the result of the test equals matches against the proved expression

data/riot.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = "riot"
-  s.version  = "0.9.0"
+  s.version  = "0.9.1"
   s.date     = "2009-10-03"
   s.summary  = "An extremely fast, expressive, and context-driven unit-testing framework"
   s.email    = %w[gus@gusg.us]

data/test/assertion_test.rb

@@ -39,6 +39,30 @@ end # nil assertion
 
 context "raises assertion:" do
   should("raise an Exception") { raise Exception }.raises(Exception)
+
+  should "pass if provided message equals expectation" do
+    Riot::Assertion.new("foo", fake_context) do
+      raise Exception, "I'm a nerd"
+    end.raises(Exception, "I'm a nerd")
+  end.equals(true)
+
+  should "fail if provided message does not equal expectation" do
+    Riot::Assertion.new("foo", fake_context) do
+      raise(Exception, "I'm a nerd")
+    end.raises(Exception, "But I'm not")
+  end.kind_of(Riot::Failure)
+
+  should "pass if provided message matches expectation" do
+    Riot::Assertion.new("foo", fake_context) do
+      raise(Exception, "I'm a nerd")
+    end.raises(Exception, %r[nerd])
+  end.equals(true)
+
+  should "fail if provided message does not match expectation" do
+    Riot::Assertion.new("foo", fake_context) do
+      raise(Exception, "I'm a nerd")
+    end.raises(Exception, %r[foo])
+  end.kind_of(Riot::Failure)
 end # raises assertion
 
 context "matching assertion:" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: riot
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors: 
 - Justin Knowlden