assert 2.1.2 → 2.2.0

data/lib/assert/context.rb

@@ -223,6 +223,20 @@ module Assert
       raise(Result::TestSkipped, skip_msg || "")
     end
 
+    # alter the backtraces of fail results generated in the given block
+    def with_backtrace(bt, &block)
+      bt ||= []
+      current_results.count.tap do |count|
+        begin
+          instance_eval(&block)
+        rescue Result::TestSkipped, Result::TestFailure => e
+          e.set_backtrace(bt); raise(e)
+        ensure
+          current_results[count..-1].each{ |r| r.set_backtrace(bt) }
+        end
+      end
+    end
+
     def subject
       if subj = self.class.subject
         instance_eval(&subj)
@@ -252,5 +266,9 @@ module Assert
       end
     end
 
+    def current_results
+      @__running_test__.results
+    end
+
   end
 end

data/lib/assert/result.rb

@@ -52,6 +52,12 @@ module Assert::Result
       (self.backtrace.filtered.first || self.test.context_info.called_from).to_s
     end
 
+    # chose to implement this way instead of using an `attr_writer` to be
+    # consistant with how you override exception backtraces.
+    def set_backtrace(bt)
+      @backtrace = Backtrace.new(bt || [])
+    end
+
     def ==(other)
       self.class == other.class && self.message == other.message
     end
@@ -110,7 +116,7 @@ module Assert::Result
   end
 
   # raised by the 'skip' context helper to break test execution
-  class TestSkipped < RuntimeError; end
+  TestSkipped = Class.new(RuntimeError)
 
   class Skip < Base
 

data/lib/assert/version.rb

@@ -1,3 +1,3 @@
 module Assert
-  VERSION = "2.1.2"
+  VERSION = "2.2.0"
 end

data/test/unit/context_tests.rb

@@ -17,7 +17,7 @@ class Assert::Context
 
     should have_imeths :assert, :assert_not, :refute
     should have_imeths :skip, :pass, :fail, :flunk, :ignore
-    should have_imeths :subject
+    should have_imeths :with_backtrace, :subject
 
     def test_should_collect_context_info
       this = @__running_test__
@@ -219,6 +219,33 @@ class Assert::Context
 
   end
 
+  class WithBacktraceTests < BasicTests
+    desc "with_backtrace method"
+    setup do
+      @from_bt = ['called_from_here']
+      @from_block = proc { ignore; fail; pass; skip 'todo' }
+    end
+
+    should "replace the fail results from the block with the given backtrace" do
+      @context.fail 'not affected'
+      begin
+        @context.with_backtrace(@from_bt, &@from_block)
+      rescue Assert::Result::TestSkipped => e
+        @test.results << Assert::Result::Skip.new(@test, e)
+      end
+
+      assert_equal 5, @test.results.size
+      norm_fail, with_ignore, with_fail, with_pass, with_skip = @test.results
+
+      assert_not_equal @from_bt, norm_fail.backtrace
+      assert_equal @from_bt, with_ignore.backtrace
+      assert_equal @from_bt, with_fail.backtrace
+      assert_equal @from_bt, with_pass.backtrace
+      assert_equal @from_bt, with_skip.backtrace
+    end
+
+  end
+
   class InspectTests < BasicTests
     desc "inspect method"
     setup do

data/test/unit/result_tests.rb

@@ -40,6 +40,7 @@ module Assert::Result
 
     should have_readers :test, :message, :backtrace
     should have_imeths :test_name, :name, :to_sym, :to_s, :trace
+    should have_imeth :set_backtrace
 
     Assert::Result.types.keys.each do |type|
       should "respond to the instance method ##{type}?" do
@@ -64,6 +65,13 @@ module Assert::Result
       assert_equal exp, subject.inspect
     end
 
+    should "allow overriding the result backtrace with `set_backtrace`" do
+      subject.set_backtrace(['bt'])
+
+      assert_kind_of Assert::Result::Backtrace, subject.backtrace
+      assert_equal ['bt'], subject.backtrace
+    end
+
   end
 
   class ToStringTests < BaseTests

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: assert
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 7
   prerelease: 
   segments: 
   - 2
-  - 1
   - 2
-  version: 2.1.2
+  - 0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-02 00:00:00 Z
+date: 2013-06-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ansi