protest 0.2.1 → 0.2.2

data/README.rdoc

@@ -30,7 +30,7 @@ Protest.
 
 Or
 
-    rip install git://github.com/foca/protest.git v0.2.1
+    rip install git://github.com/foca/protest.git v0.2.2
 
 == Assertions
 

data/lib/protest/report.rb

@@ -36,6 +36,10 @@ module Protest
       end
     end
 
+    on :test do |report, test|
+      report.tests << test
+    end
+
     on :start do |report|
       report.instance_eval { @started_at = Time.now }
     end
@@ -100,9 +104,13 @@ module Protest
       @assertions || 0
     end
 
+    def tests
+      @tests ||= []
+    end
+
     # Amount ot tests run (whether passed, pending, failed, or errored.)
     def total_tests
-      passes.size + failures.size + errors.size + pendings.size
+      tests.size
     end
 
     # Seconds taken since the test suite started running

data/lib/protest/runner.rb

@@ -20,23 +20,20 @@ module Protest
     end
 
     # Run a test and report if it passes, fails, or is pending. Takes the name
-    # of the test as an argument. You can avoid reporting a passed test by
-    # passing +false+ as a second argument.
-    def report(test, report_success=true)
-      @report.on_test(Test.new(test)) if @report.respond_to?(:on_test)
-      yield
-      @report.on_pass(PassedTest.new(test)) if report_success
+    # of the test as an argument. By passing +true+ as the second argument, you
+    # force any exceptions to be re-raied and the test not reported as a pass
+    # after it finishes (for global setup/teardown blocks)
+    def report(test, running_global_setup_or_teardown=false)
+      @report.on_test(Test.new(test)) if @report.respond_to?(:on_test) && !running_global_setup_or_teardown
+      test.run(@report)
+      @report.on_pass(PassedTest.new(test)) unless running_global_setup_or_teardown
     rescue Pending => e
       @report.on_pending(PendingTest.new(test, e))
     rescue AssertionFailed => e
       @report.on_failure(FailedTest.new(test, e))
     rescue Exception => e
       @report.on_error(ErroredTest.new(test, e))
-    end
-
-    def assert(condition, message) #:nodoc:
-      @report.add_assertion
-      raise AssertionFailed, message unless condition
+      raise if running_global_setup_or_teardown
     end
   end
 end

data/lib/protest/test_case.rb

@@ -27,10 +27,15 @@ module Protest
   class TestCase
     # Run all tests in this context. Takes a Report instance in order to
     # provide output.
-    def self.run(result)
-      result.report("#{description} global setup", false) { do_global_setup }
-      tests.each {|test| test.run(result) }
-      result.report("#{description} global teardown", false) { do_global_teardown }
+    def self.run(runner)
+      runner.report(TestWrapper.new(:setup, self), true)
+      tests.each {|test| runner.report(test, false) }
+      runner.report(TestWrapper.new(:teardown, self), true)
+    rescue Exception => e
+      # If any exception bubbles up here, then it means it was during the
+      # global setup/teardown blocks, so let's just skip the rest of this
+      # context.
+      return
     end
 
     # Tests added to this context.
@@ -104,7 +109,6 @@ module Protest
       end
     end
 
-
     # Define a new test context nested under the current one. All +setup+ and
     # +teardown+ blocks defined on the current context will be inherited by the
     # new context. This method is aliased as +describe+ for your comfort.
@@ -148,23 +152,22 @@ module Protest
     #
     # If the test's block is nil, then the test will be marked as pending and
     # nothing will be run.
-    def run(runner)
-      @runner = runner
-
-      runner.report(self) do
-        pending if test.nil?
+    def run(report)
+      @report = report
+      pending if test.nil?
 
-        setup
-        instance_eval(&test)
-        teardown
-      end
+      setup
+      instance_eval(&test)
+      teardown
+      @report = nil
     end
 
     # Ensure a condition is met. This will raise AssertionFailed if the
     # condition isn't met. You can override the default failure message
     # by passing it as an argument.
     def assert(condition, message="Expected condition to be satisfied")
-      @runner.assert(condition, message)
+      @report.add_assertion
+      raise AssertionFailed, message unless condition
     end
 
     # Provided for Test::Unit compatibility, this lets you include
@@ -217,5 +220,22 @@ module Protest
     def self.inherited(child)
       Protest.add_test_case(child)
     end
+
+    # Provides the TestCase API for global setup/teardown blocks, so they can be
+    # "faked" as tests into the reporter (they aren't counted towards the total
+    # number of tests but they could count towards the number of failures/errors.)
+    class TestWrapper #:nodoc:
+      attr_reader :name
+
+      def initialize(type, test_case)
+        @type = type
+        @test = test_case
+        @name = "Global #{@type} for #{test_case.description}"
+      end
+
+      def run(report)
+        @test.send("do_global_#{@type}")
+      end
+    end
   end
 end

data/protest.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name    = "protest"
-  s.version = "0.2.1"
-  s.date    = "2009-09-11"
+  s.version = "0.2.2"
+  s.date    = "2009-09-17"
 
   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: protest
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - "Nicol\xC3\xA1s Sanguinetti"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-11 00:00:00 -03:00
+date: 2009-09-17 00:00:00 -03:00
 default_executable: 
 dependencies: []