assert 0.7.1 → 0.7.2

data/Gemfile.lock

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

data/lib/assert/context.rb

@@ -115,19 +115,23 @@ module Assert
       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
-          method_name = "test: #{desc_or_macro}"
-
-          # if no block given, create a test that just skips
-          method_block = block_given? ? block : (Proc.new { skip })
-
+        elsif block_given?
           ci = Suite::ContextInfo.new(self, called_from, first_caller || caller.first)
-          Assert.suite.tests << Test.new(method_name, ci, &method_block)
+          test_name = desc_or_macro
+
+          # 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)
         end
       end
 
       def test_eventually(desc_or_macro, called_from=nil, first_caller=nil, &block)
-        test(desc_or_macro, called_from, first_caller || caller.first)
+        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
+
+        # create a test from a proc that just skips
+        Assert.suite.tests << Test.new(test_name, ci, &(Proc.new { skip }))
       end
       alias_method :test_skip, :test_eventually
 
@@ -139,7 +143,10 @@ module Assert
       end
 
       def should_eventually(desc_or_macro, called_from=nil, first_caller=nil, &block)
-        should(desc_or_macro, called_from, first_caller || caller.first)
+        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)
       end
       alias_method :should_skip, :should_eventually
 

data/lib/assert/macro.rb

@@ -5,8 +5,11 @@ module Assert
     # arguments.  When passed as an argument to the 'should' method, a macro
     # will be instance_eval'd in that Assert::Context.
 
-    def initialize(*args, &block)
+    attr_accessor :name
+
+    def initialize(name=nil, *args, &block)
       raise ArgumentError unless block_given?
+      @name = name || "run this macro"
       super()
     end
 

data/lib/assert/macros/methods.rb

@@ -11,7 +11,8 @@ module Assert::Macros
 
       def have_instance_method(*methods)
         called_from = (methods.last.kind_of?(Array) ? methods.pop : caller).first
-        Assert::Macro.new do
+        name = "have instance methods: #{methods.map{|m| "'#{m}'"}.join(', ')}"
+        Assert::Macro.new(name) do
           methods.each do |method|
             should "respond to instance method ##{method}", called_from do
               assert_respond_to method, subject, "#{subject.class.name} does not have instance method ##{method}"
@@ -23,7 +24,8 @@ module Assert::Macros
 
       def have_class_method(*methods)
         called_from = (methods.last.kind_of?(Array) ? methods.pop : caller).first
-        Assert::Macro.new do
+        name = "have class methods: #{methods.map{|m| "'#{m}'"}.join(', ')}"
+        Assert::Macro.new(name) do
           methods.each do |method|
             should "respond to class method ##{method}", called_from do
               assert_respond_to method, subject.class, "#{subject.class.name} does not have class method ##{method}"

data/lib/assert/setup/helpers.rb

@@ -10,7 +10,7 @@ module Assert
 
     class << self
 
-      USER_TEST_HELPER = "~/.assert/options"
+      USER_TEST_HELPER = "./.assert/options"
 
       # assume the test dir path is ./test and look for helpers in ./test/helper.rb
       def package_test_dir
@@ -33,26 +33,24 @@ module Assert
       private
 
       def require_user_test_helper
-        begin
-          if ENV['HOME']
-            require File.expand_path(USER_TEST_HELPER)
-          end
-        rescue LoadError => err
-          # do nothing
+        if ENV['HOME']
+          safe_require File.expand_path(USER_TEST_HELPER, ENV['HOME'])
         end
       end
 
       # require the package's test/helper file if it exists
       def require_package_test_helper(root_path)
-        begin
-          require package_helper_file(root_path)
-        rescue LoadError => err
-          # do nothing
-        end
+        safe_require package_helper_file(root_path)
       end
 
       def package_helper_file(root_path)
-        File.join(root_path, package_test_dir, package_helper_name + '.rb')
+        File.join(root_path, package_test_dir, package_helper_name)
+      end
+
+      def safe_require(helper_file)
+        if File.exists?(helper_file+".rb")
+          require helper_file
+        end
       end
 
       # this method inspects the caller info and finds the caller's root path

data/lib/assert/test.rb

@@ -115,7 +115,7 @@ module Assert
 
     def name_from_context(name)
       [ self.context_class.description,
-        name.gsub(/^test:\s+should/, "should")
+        name
       ].compact.reject{|p| p.empty?}.join(" ")
     end
 

data/lib/assert/version.rb

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

data/test/context/class_methods_test.rb

@@ -301,19 +301,50 @@ class Assert::Context
     setup do
       @test_count_before = Assert.suite.tests.size
 
-      @should_desc = "be true"
-      @should_block = ::Proc.new{ assert(true) }
-      @method_name = "test: #{@should_desc}"
+      @test_desc = "be true"
+      @test_block = ::Proc.new{ assert(true) }
+      @test_name = @test_desc
 
-      d, b = @should_desc, @should_block
+      d, b = @test_desc, @test_block
       @context_class = Factory.context_class { test(d, &b) }
       @context = @context_class.new(Factory.test("something", Factory.context_info(@context_class)))
     end
     subject{ @context }
 
-    should "define a test method named after the should desc" do
+    should "build a test with a given desc and code block" do
       assert_equal @test_count_before+1, Assert.suite.tests.size
-      assert_equal @should_block, Assert.suite.tests.last.code
+      built_test = Assert.suite.tests.last
+
+      assert_kind_of Assert::Test, built_test
+      assert_equal @test_name, built_test.name
+
+      assert_equal @test_block, built_test.code
+    end
+
+  end
+
+  class TestMacroTest < TestMethTest
+    desc "on a macro"
+    setup do
+      @test_count_before = Assert.suite.tests.size
+      d, b = @test_desc, @test_block
+      m = Assert::Macro.new do
+        test(d, &b)
+        test(d, &b)
+      end
+      @context_class = Factory.context_class { test(m) }
+      @context = @context_class.new(Factory.test("something", Factory.context_info(@context_class)))
+    end
+    subject{ @context }
+
+    should "build tests from the macro" do
+      assert_equal @test_count_before+2, Assert.suite.tests.size
+      built_test = Assert.suite.tests.last
+
+      assert_kind_of Assert::Test, built_test
+      assert_equal @test_name, built_test.name
+
+      assert_equal @test_block, built_test.code
     end
 
   end
@@ -321,13 +352,15 @@ class Assert::Context
   class NoBlockTestMethTest < TestMethTest
     desc "called with no block"
     setup do
-      d = @should_desc
+      @test_count_before = Assert.suite.tests.size
+      d = @test_desc
       @context_class = Factory.context_class { test(d) }
       @context = @context_class.new(Factory.test("something", Factory.context_info(@context_class)))
     end
     subject{ @context }
 
-    should "define a test method named after the should desc that raises a test skipped" do
+    should "build a test that skips" do
+      assert_equal @test_count_before+1, Assert.suite.tests.size
       assert_raises(Assert::Result::TestSkipped) do
         subject.instance_eval(&Assert.suite.tests.last.code)
       end
@@ -336,9 +369,10 @@ class Assert::Context
   end
 
   class TestEventuallyTest < TestMethTest
-    desc "test_eventually method"
+    desc "called with '_eventually'"
     setup do
-      d, b = @should_desc, @should_block
+      @test_count_before = Assert.suite.tests.size
+      d, b = @test_desc, @test_block
       @context_class = Factory.context_class do
         test_eventually(d, &b)
       end
@@ -346,7 +380,31 @@ class Assert::Context
     end
     subject{ @context }
 
-    should "define a test method named after the should desc that raises a test skipped" do
+    should "build a test that skips" do
+      assert_equal @test_count_before+1, Assert.suite.tests.size
+      assert_raises(Assert::Result::TestSkipped) do
+        subject.instance_eval(&Assert.suite.tests.last.code)
+      end
+    end
+
+  end
+
+  class TestEventuallyMacroTest < TestEventuallyTest
+    desc "on a macro"
+    setup do
+      @test_count_before = Assert.suite.tests.size
+      d, b = @test_desc, @test_block
+      m = Assert::Macro.new do
+        test(d, &b)
+        test(d, &b)
+      end
+      @context_class = Factory.context_class { test_eventually(m) }
+      @context = @context_class.new(Factory.test("something", Factory.context_info(@context_class)))
+    end
+    subject{ @context }
+
+    should "build a test that skips" do
+      assert_equal @test_count_before+1, Assert.suite.tests.size
       assert_raises(Assert::Result::TestSkipped) do
         subject.instance_eval(&Assert.suite.tests.last.code)
       end
@@ -363,7 +421,7 @@ class Assert::Context
 
       @should_desc = "be true"
       @should_block = ::Proc.new{ assert(true) }
-      @method_name = "test: should #{@should_desc}"
+      @test_name = "should #{@should_desc}"
 
       d, b = @should_desc, @should_block
       @context_class = Factory.context_class { should(d, &b) }
@@ -371,9 +429,40 @@ class Assert::Context
     end
     subject{ @context }
 
-    should "define a test method named after the should desc" do
+    should "build a test with a given should desc and code block" do
       assert_equal @test_count_before+1, Assert.suite.tests.size
-      assert_equal @should_block, Assert.suite.tests.last.code
+      built_test = Assert.suite.tests.last
+
+      assert_kind_of Assert::Test, built_test
+      assert_equal @test_name, built_test.name
+
+      assert_equal @should_block, built_test.code
+    end
+
+  end
+
+  class ShouldMacroTest < ShouldTest
+    desc "on a macro"
+    setup do
+      @test_count_before = Assert.suite.tests.size
+      d, b = @should_desc, @should_block
+      m = Assert::Macro.new do
+        should(d, &b)
+        should(d, &b)
+      end
+      @context_class = Factory.context_class { should m }
+      @context = @context_class.new(Factory.test("something", Factory.context_info(@context_class)))
+    end
+    subject{ @context }
+
+    should "build tests from the macro" do
+      assert_equal @test_count_before+2, Assert.suite.tests.size
+      built_test = Assert.suite.tests.last
+
+      assert_kind_of Assert::Test, built_test
+      assert_equal @test_name, built_test.name
+
+      assert_equal @should_block, built_test.code
     end
 
   end
@@ -381,13 +470,15 @@ class Assert::Context
   class NoBlockShouldTest < ShouldTest
     desc "called with no block"
     setup do
+      @test_count_before = Assert.suite.tests.size
       d = @should_desc
       @context_class = Factory.context_class { should(d) }
       @context = @context_class.new(Factory.test("something", Factory.context_info(@context_class)))
     end
     subject{ @context }
 
-    should "define a test method named after the should desc that raises a test skipped" do
+    should "build a test that skips" do
+      assert_equal @test_count_before+1, Assert.suite.tests.size
       assert_raises(Assert::Result::TestSkipped) do
         subject.instance_eval(&Assert.suite.tests.last.code)
       end
@@ -396,15 +487,40 @@ class Assert::Context
   end
 
   class ShouldEventuallyTest < ShouldTest
-    desc "should_eventually method"
+    desc "called with '_eventually'"
     setup do
+      @test_count_before = Assert.suite.tests.size
       d, b = @should_desc, @should_block
       @context_class = Factory.context_class { should_eventually(d, &b) }
       @context = @context_class.new(Factory.test("something", Factory.context_info(@context_class)))
     end
     subject{ @context }
 
-    should "define a test method named after the should desc that raises a test skipped" do
+    should "build a test that skips" do
+      assert_equal @test_count_before+1, Assert.suite.tests.size
+      assert_raises(Assert::Result::TestSkipped) do
+        subject.instance_eval(&Assert.suite.tests.last.code)
+      end
+    end
+
+  end
+
+  class ShouldEventuallyMacroTest < ShouldEventuallyTest
+    desc "on a macro"
+    setup do
+      @test_count_before = Assert.suite.tests.size
+      d, b = @should_desc, @should_block
+      m = Assert::Macro.new do
+        should(d, &b)
+        should(d, &b)
+      end
+      @context_class = Factory.context_class { should_eventually(m) }
+      @context = @context_class.new(Factory.test("something", Factory.context_info(@context_class)))
+    end
+    subject{ @context }
+
+    should "build a test that skips" do
+      assert_equal @test_count_before+1, Assert.suite.tests.size
       assert_raises(Assert::Result::TestSkipped) do
         subject.instance_eval(&Assert.suite.tests.last.code)
       end

data/test/macro_test.rb

@@ -6,7 +6,21 @@ class Assert::Macro
 
   class BaseTest < Assert::Context
     desc "a macro"
-    subject { Assert::Macro.new {} }
+    setup { @macro = Assert::Macro.new {} }
+    subject { @macro }
+
+    should "have an accessor for its (optional) name" do
+      assert_respond_to :name, subject
+      assert_respond_to :name=, subject
+    end
+
+    should "default its name if no given" do
+      assert_equal "run this macro", (Assert::Macro.new {}).name
+    end
+
+    should "initialize with a given name" do
+      assert_equal "test", (Assert::Macro.new("test") {}).name
+    end
 
     should "be a Proc" do
       assert_kind_of ::Proc, subject
@@ -17,6 +31,7 @@ class Assert::Macro
         Assert::Macro.new
       end
     end
+
   end
 
   class InstanceMethodsTest < Assert::Context

data/test/test_test.rb

@@ -5,7 +5,7 @@ class Assert::Test
   class BasicTest < Assert::Context
     desc "Assert test"
     setup do
-      test_name = "test: should do something amazing"
+      test_name = "should do something amazing"
       @test_code = lambda{ assert(true) }
       context_desc = "context class"
       @context_class = Factory.context_class do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: assert
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 7
-  - 1
-  version: 0.7.1
+  - 2
+  version: 0.7.2
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-13 00:00:00 Z
+date: 2011-11-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Test::Unit style testing framework, just better than Test::Unit.