mcmire-protest 0.3.1 → 0.3.2

data/lib/protest.rb

@@ -1,5 +1,5 @@
 module Protest
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 
   # Exception raised when an assertion fails. See TestCase#assert
   class AssertionFailed < StandardError; end

data/lib/protest/test_case.rb

@@ -183,7 +183,7 @@ module Protest
     # by passing it as an argument.
     def assert(condition, message="Expected condition to be satisfied")
       @report.add_assertion
-      raise AssertionFailed, message unless condition
+      raise AssertionFailed, (Proc === message ? message.call : message) unless condition
     end
 
     # Provided for Test::Unit compatibility, this lets you include
@@ -202,6 +202,10 @@ module Protest
     def name
       @name
     end
+    
+    def context_description
+      self.class.description
+    end
 
     private
 
@@ -252,6 +256,10 @@ module Protest
       def run(report)
         @test.send("do_global_#{@type}")
       end
+      
+      def context_description
+        @test.description
+      end
     end
   end
 end

data/lib/protest/utils/summaries.rb

@@ -71,10 +71,11 @@ module Protest
         pad_indexes = failures_and_errors.size.to_s.size
         failures_and_errors.each_with_index do |error, index|
           colorize_as = ErroredTest === error ? :errored : :failed
-          puts "  #{pad(index+1, pad_indexes)}) #{test_type(error)} in `#{error.test.class.description} #{error.test_name}' (on line #{error.line} of `#{error.file}')", colorize_as
+          puts "  #{pad(index+1, pad_indexes)}) #{test_type(error)} in `#{error.test.context_description} #{error.test_name}' (on line #{error.line} of `#{error.file}')", colorize_as
           # If error message has line breaks, indent the message
           prefix = "with"
-          unless error.error.is_a?(Protest::AssertionFailed) || error.error.is_a?(::Test::Unit::AssertionFailedError)
+          unless error.error.is_a?(Protest::AssertionFailed) ||
+          ((RUBY_VERSION =~ /^1\.9/) ? error.error.is_a?(MiniTest::Assertion) : error.error.is_a?(::Test::Unit::AssertionFailedError))
             prefix << " #{error.error.class}" 
           end
           if error.error_message =~ /\n/
@@ -113,9 +114,10 @@ module Protest
           # and in Ruby 1.8, String#each is equivalent to String#each_line
           # so effectively it's equivalent to .split("\n") but keeping the \n's
           strings = [strings] unless Array === strings
-          strings.map do |str|
+          out = strings.map do |str|
             str.to_s.split("\n").map {|s| indent_with * size + s }.join("\n")
           end
+          out.size == 1 ? out[0] : out
         end
 
         def pad(str, amount)

data/mcmire-protest.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name    = "mcmire-protest"
-  s.version = "0.3.1"
-  s.date    = "2010-01-10"
+  s.version = "0.3.2"
+  s.date    = "2010-01-14"
 
   s.description = "Protest is a tiny, simple, and easy-to-extend test framework"
   s.summary     = s.description

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mcmire-protest
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - "Nicol\xC3\xA1s Sanguinetti"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-10 00:00:00 -06:00
+date: 2010-01-14 00:00:00 -06:00
 default_executable: 
 dependencies: []