riot 0.9.5 → 0.9.6

data/lib/riot/macros.rb

@@ -27,14 +27,18 @@ 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)
+    #
+    # You can also check to see if the provided message equals or matches your expectations. The message from
+    # the actual raised exception will be converted to a string before any comparison is executed.
     #   asserts("test") { raise My::Exception, "Foo" }.raises(My::Exception, "Foo")
     #   asserts("test") { raise My::Exception, "Foo Bar" }.raises(My::Exception, /Bar/)
+    #   asserts("test") { raise My::Exception, ["a", "b"] }.raises(My::Exception, "ab")
     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}])
+      if 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

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name     = "riot"
-  s.version  = "0.9.5"
-  s.date     = "2009-10-06"
+  s.version  = "0.9.6"
+  s.date     = "2009-10-07"
   s.summary  = "An extremely fast, expressive, and context-driven unit-testing framework"
   s.email    = %w[gus@gusg.us]
   s.homepage = "http://github.com/thumblemonks/protest"

data/test/assertion_macros/assertion_macro_raises_test.rb

@@ -7,17 +7,25 @@ context "raises assertion:" do
 
   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.equals(true)
+  end
 
   should "fail if provided message does not equal expectation" do
     Riot::Assertion.new("foo", topic) { raise(Exception, "I'm a nerd") }.raises(Exception, "But I'm not")
   end.kind_of(Riot::Failure)
 
   should "pass if provided message matches expectation" do
-    Riot::Assertion.new("foo", topic) { raise(Exception, "I'm a nerd") }.raises(Exception, %r[nerd])
-  end.equals(true)
+    Riot::Assertion.new("foo", topic) { raise(Exception, "I'm a nerd") }.raises(Exception, /nerd/)
+  end
 
   should "fail if provided message does not match expectation" do
-    Riot::Assertion.new("foo", topic) { raise(Exception, "I'm a nerd") }.raises(Exception, %r[foo])
+    Riot::Assertion.new("foo", topic) { raise(Exception, "I'm a nerd") }.raises(Exception, /foo/)
   end.kind_of(Riot::Failure)
+
+  should "pass if provided message as array equals expectation" do
+    Riot::Assertion.new("foo", topic) { raise(Exception, ["foo", "bar"]) }.raises(Exception, "foobar")
+  end
+
+  should "pass if provided message as array matches expectation" do
+    Riot::Assertion.new("foo", topic) { raise(Exception, ["foo", "bar"]) }.raises(Exception, /oba/)
+  end
 end # raises assertion

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: riot
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Justin Knowlden
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-06 00:00:00 -05:00
+date: 2009-10-07 00:00:00 -05:00
 default_executable: 
 dependencies: []