assert 2.1.0 → 2.1.1

data/lib/assert/context.rb

@@ -122,16 +122,17 @@ module Assert
           # create a test from the given code block
           Assert.suite.tests << Test.new(test_name, ci, &block)
         else
-          test_eventually(desc_or_macro, called_from, first_caller, &block)
+          test_eventually(desc_or_macro, called_from, first_caller || caller.first, &block)
         end
       end
 
       def test_eventually(desc_or_macro, called_from=nil, first_caller=nil, &block)
         ci = Suite::ContextInfo.new(self, called_from, first_caller || caller.first)
         test_name = desc_or_macro.kind_of?(Macro) ? desc_or_macro.name : desc_or_macro
+        skip_block = block.nil? ? Proc.new { skip 'TODO' } : Proc.new { skip }
 
         # create a test from a proc that just skips
-        Assert.suite.tests << Test.new(test_name, ci, &(Proc.new { skip }))
+        Assert.suite.tests << Test.new(test_name, ci, &skip_block)
       end
       alias_method :test_skip, :test_eventually
 
@@ -146,7 +147,7 @@ module Assert
         if !desc_or_macro.kind_of?(Macro)
           desc_or_macro = "should #{desc_or_macro}"
         end
-        test_eventually(desc_or_macro, called_from, first_caller || caller.first)
+        test_eventually(desc_or_macro, called_from, first_caller || caller.first, &block)
       end
       alias_method :should_skip, :should_eventually
 

data/lib/assert/result.rb

@@ -135,6 +135,11 @@ module Assert::Result
       "Skip"
     end
 
+    # override of the base, show the test's context info called_from
+    def trace
+      self.test.context_info.called_from || super
+    end
+
   end
 
   class Error < Base

data/lib/assert/suite.rb

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

data/lib/assert/version.rb

@@ -1,3 +1,3 @@
 module Assert
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

data/test/unit/context/test_should_singleton_tests.rb

@@ -38,52 +38,70 @@ class Assert::Context
       assert_equal @test_block, built_test.code
     end
 
-    should "build a test that skips when `test` called with no block" do
-      d = @test_desc
-      context_class = Factory.context_class { test(d) }
-      context_info  = Factory.context_info(context_class)
-      context = context_class.new(Factory.test("whatever", context_info))
+    should "build a test that skips with no msg when `test_eventually` called" do
+      d, b = @test_desc, @test_block
+      context = build_eval_context{ test_eventually(d, &b) }
+      err = capture_err(Assert::Result::TestSkipped) do
+        context.instance_eval(&Assert.suite.tests.last.code)
+      end
 
       assert_equal @test_count_before+1, Assert.suite.tests.size
-      assert_raises(Assert::Result::TestSkipped) do
+      assert_equal "", err.message
+    end
+
+    should "build a test that skips with no msg  when `should_eventually` called" do
+      d, b = @test_desc, @test_block
+      context = build_eval_context{ should_eventually(d, &b) }
+      err = capture_err(Assert::Result::TestSkipped) do
         context.instance_eval(&Assert.suite.tests.last.code)
       end
+
+      assert_equal @test_count_before+1, Assert.suite.tests.size
+      assert_equal "", err.message
     end
 
-    should "build a test that skips when `should` called with no block" do
+    should "skip with the msg \"TODO\" when `test` called with no block" do
       d = @test_desc
-      context_class = Factory.context_class { should(d) }
-      context_info  = Factory.context_info(context_class)
-      context = context_class.new(Factory.test("whatever", context_info))
-
-      assert_equal @test_count_before+1, Assert.suite.tests.size
-      assert_raises(Assert::Result::TestSkipped) do
+      context = build_eval_context { test(d) } # no block passed
+      err = capture_err(Assert::Result::TestSkipped) do
         context.instance_eval(&Assert.suite.tests.last.code)
       end
-    end
-
-    should "build a test that skips when `test_eventually` called" do
-      d, b = @test_desc, @test_block
-      context_class = Factory.context_class { test_eventually(d, &b) }
-      context_info  = Factory.context_info(context_class)
-      context = context_class.new(Factory.test("whatever", context_info))
 
       assert_equal @test_count_before+1, Assert.suite.tests.size
-      assert_raises(Assert::Result::TestSkipped) do
+      assert_equal "TODO", err.message
+    end
+
+    should "skip with the msg \"TODO\" when `should` called with no block" do
+      d = @test_desc
+      context = build_eval_context { should(d) } # no block passed
+      err = capture_err(Assert::Result::TestSkipped) do
         context.instance_eval(&Assert.suite.tests.last.code)
       end
+
+      assert_equal @test_count_before+1, Assert.suite.tests.size
+      assert_equal "TODO", err.message
     end
 
-    should "build a test that skips when `should_eventually` called" do
-      d, b = @test_desc, @test_block
-      context_class = Factory.context_class { should_eventually(d, &b) }
-      context_info  = Factory.context_info(context_class)
-      context = context_class.new(Factory.test("whatever", context_info))
+    should "skip with the msg \"TODO\" when `test_eventually` called with no block" do
+      d = @test_desc
+      context = build_eval_context{ test_eventually(d) } # no block given
+      err = capture_err(Assert::Result::TestSkipped) do
+        context.instance_eval(&Assert.suite.tests.last.code)
+      end
 
       assert_equal @test_count_before+1, Assert.suite.tests.size
-      assert_raises(Assert::Result::TestSkipped) do
+      assert_equal "TODO", err.message
+    end
+
+    should "skip with the msg \"TODO\" when `should_eventually` called with no block" do
+      d = @test_desc
+      context = build_eval_context{ should_eventually(d) } # no block given
+      err = capture_err(Assert::Result::TestSkipped) do
         context.instance_eval(&Assert.suite.tests.last.code)
       end
+
+      assert_equal @test_count_before+1, Assert.suite.tests.size
+      assert_equal "TODO", err.message
     end
 
     should "build a test from a macro using `test`" do
@@ -105,9 +123,7 @@ class Assert::Context
     should "build a test that skips from a macro using `test_eventually`" do
       d, b = @test_desc, @test_block
       m = Assert::Macro.new{ test(d, &b); test(d, &b) }
-      context_class = Factory.context_class { test_eventually(m) }
-      context_info  = Factory.context_info(context_class)
-      context = context_class.new(Factory.test("whatever", context_info))
+      context = build_eval_context{ test_eventually(m) }
 
       assert_equal @test_count_before+1, Assert.suite.tests.size
       assert_raises(Assert::Result::TestSkipped) do
@@ -118,9 +134,7 @@ class Assert::Context
     should "build a test that skips from a macro using `should_eventually`" do
       d, b = @test_desc, @test_block
       m = Assert::Macro.new{ should(d, &b); should(d, &b) }
-      context_class = Factory.context_class { should_eventually(m) }
-      context_info  = Factory.context_info(context_class)
-      context = context_class.new(Factory.test("whatever", context_info))
+      context = build_eval_context{ should_eventually(m) }
 
       assert_equal @test_count_before+1, Assert.suite.tests.size
       assert_raises(Assert::Result::TestSkipped) do
@@ -129,6 +143,22 @@ class Assert::Context
 
     end
 
+    private
+
+    def build_eval_context(&build_block)
+      context_class = Factory.context_class &build_block
+      context_info  = Factory.context_info(context_class)
+      context_class.new(Factory.test("whatever", context_info))
+    end
+
+    def capture_err(err_class, &block)
+      begin
+        block.call
+      rescue err_class => e
+        e
+      end
+    end
+
   end
 
 end

data/test/unit/suite_tests.rb

@@ -181,14 +181,18 @@ class Assert::Suite
     end
     subject{ @info }
 
-    should have_readers :called_from, :first_caller, :klass, :file
+    should have_readers :called_from, :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.first_caller
+    should "set its called_from to the called_from or first caller on init" do
+      info = Assert::Suite::ContextInfo.new(@klass, @caller.first, nil)
+      assert_equal @caller.first, info.called_from
+
+      info = Assert::Suite::ContextInfo.new(@klass, nil, @caller.first)
+      assert_equal @caller.first, info.called_from
     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: 11
+  hash: 9
   prerelease: 
   segments: 
   - 2
   - 1
-  - 0
-  version: 2.1.0
+  - 1
+  version: 2.1.1
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-25 00:00:00 Z
+date: 2013-04-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ansi