assert 0.7.0 → 0.7.1

data/CHANGELOG.rdoc

@@ -1,6 +1,6 @@
 == Assert Changes
 
-=== v0.7.0
+=== v0.7.x
 * tests know context info (klass, called_from, file) (#62)
 * suites track tests ungrouped
 * fixed issue where method macros display incorrect fail traces
@@ -17,5 +17,5 @@
 * overhaul to how the rake tasks are generated and handled (#69)
 * added name attr to Result model (#61)
 
-=== v0.6.0
+=== v0.6.x
 * everything prior to changelog tracking...

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    assert (0.7.0)
+    assert (0.7.1)
       assert-view (~> 0.4)
 
 GEM
   remote: http://rubygems.org/
   specs:
     ansi (1.3.0)
-    assert-view (0.4.0)
+    assert-view (0.4.1)
       ansi (~> 1.3)
       undies (~> 1.1)
     rake (0.9.2)

data/lib/assert/context.rb

@@ -18,7 +18,6 @@ module Assert
     # capture any context info, build a test obj, and add it to the suite
     def self.method_added(method_name)
       if method_name.to_s =~ Suite::TEST_METHOD_REGEX
-        called_from = caller.first
         klass_method_name = "#{self}##{method_name}"
 
         if Assert.suite.test_methods.include?(klass_method_name)
@@ -28,7 +27,7 @@ module Assert
           Assert.suite.test_methods << klass_method_name
         end
 
-        ci = Suite::ContextInfo.new(self, called_from)
+        ci = Suite::ContextInfo.new(self, nil, caller.first)
         Assert.suite.tests << Test.new(method_name.to_s, ci, method_name)
       end
     end
@@ -113,8 +112,7 @@ module Assert
         end
       end
 
-      def test(desc_or_macro, called_from=nil, &block)
-        called_from ||= caller.first
+      def test(desc_or_macro, called_from=nil, first_caller=nil, &block)
         if desc_or_macro.kind_of?(Macro)
           instance_eval(&desc_or_macro)
         else
@@ -123,27 +121,25 @@ module Assert
           # if no block given, create a test that just skips
           method_block = block_given? ? block : (Proc.new { skip })
 
-          ci = Suite::ContextInfo.new(self, called_from)
+          ci = Suite::ContextInfo.new(self, called_from, first_caller || caller.first)
           Assert.suite.tests << Test.new(method_name, ci, &method_block)
         end
       end
 
-      def test_eventually(desc_or_macro, called_from=nil, &block)
-        called_from ||= caller.first
-        test(desc_or_macro, called_from)
+      def test_eventually(desc_or_macro, called_from=nil, first_caller=nil, &block)
+        test(desc_or_macro, called_from, first_caller || caller.first)
       end
       alias_method :test_skip, :test_eventually
 
-      def should(desc_or_macro, called_from=nil, &block)
-        called_from ||= caller.first
+      def should(desc_or_macro, called_from=nil, first_caller=nil, &block)
         if !desc_or_macro.kind_of?(Macro)
           desc_or_macro = "should #{desc_or_macro}"
         end
-        test(desc_or_macro, called_from, &block)
+        test(desc_or_macro, called_from, first_caller || caller.first, &block)
       end
 
-      def should_eventually(desc_or_macro, called_from=nil, &block)
-        should(desc_or_macro, called_from)
+      def should_eventually(desc_or_macro, called_from=nil, first_caller=nil, &block)
+        should(desc_or_macro, called_from, first_caller || caller.first)
       end
       alias_method :should_skip, :should_eventually
 

data/lib/assert/result.rb

@@ -165,7 +165,7 @@ module Assert::Result
 
     # override of the base, show the test's context info called_from
     def trace
-      self.test.context_info.called_from
+      self.test.context_info.called_from || super
     end
 
   end

data/lib/assert/suite.rb

@@ -5,13 +5,14 @@ module Assert
 
     class ContextInfo
 
-      attr_reader :klass, :called_from, :file
+      attr_reader :called_from, :first_caller, :klass, :file
 
-      def initialize(klass, called_from=nil)
-        @klass = klass
+      def initialize(klass, called_from=nil, first_caller=nil)
+        @first_caller = first_caller
         @called_from = called_from
-        @file = if called_from
-          called_from.gsub(/\:[0-9]+.*$/, '')
+        @klass = klass
+        @file = if (@called_from || @first_caller)
+          (@called_from || @first_caller).gsub(/\:[0-9]+.*$/, '')
         end
       end
 

data/lib/assert/version.rb

@@ -1,3 +1,3 @@
 module Assert
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/test/helper.rb

@@ -17,7 +17,7 @@ TEST_ASSERT_SUITE = Assert::Suite.new
 class TestContext < Assert::Context
   def self.method_added(meth)
     if meth.to_s =~ Assert::Suite::TEST_METHOD_REGEX
-      ci = Assert::Suite::ContextInfo.new(self, Assert.suite.current_caller_info)
+      ci = Assert::Suite::ContextInfo.new(self, Factory.context_info_called_from)
       TEST_ASSERT_SUITE.tests << Assert::Test.new(meth.to_s, ci, meth)
     end
   end

data/test/suite/context_info_test.rb

@@ -7,18 +7,18 @@ class Assert::Suite::ContextInfo
     setup do
       @caller = caller
       @klass = Assert::Context
-      @info = Assert::Suite::ContextInfo.new(@klass, @caller.first)
+      @info = Assert::Suite::ContextInfo.new(@klass, nil, @caller.first)
     end
     subject { @info }
 
-    should have_readers :klass, :called_from, :file
+    should have_readers :called_from, :first_caller, :klass, :file
 
     should "set its klass on init" do
       assert_equal @klass, subject.klass
     end
 
     should "set its called_from to the first caller on init" do
-      assert_equal @caller.first, subject.called_from
+      assert_equal @caller.first, subject.first_caller
     end
 
     should "set its file from caller info on init" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: assert
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-11 00:00:00 Z
+date: 2011-10-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development