@@ -1,6 +1,6 @@ = minitest/{unit,spec,mock} -* http://rubyforge.org/projects/bfts +* http://github.com/mattly/minitest == DESCRIPTION: @@ -13,13 +13,8 @@ mini/spec is a functionally complete spec engine. mini/mock, by Steven Baker, is a beautifully tiny mock object framework. -(This package was called miniunit once upon a time) - == FEATURES/PROBLEMS: -* Contains minitest/unit - a simple and clean test system (301 lines!). -* Contains minitest/spec - a simple and clean spec system (52 lines!). -* Contains minitest/mock - a simple and clean mock system (35 lines!). * Incredibly small and fast runner, but no bells and whistles. == RATIONALE: @@ -28,11 +23,11 @@ See design_rationale.rb to see how specs and tests work in minitest. == REQUIREMENTS: -+ Ruby 1.8, maybe even 1.6 or lower. No magic is involved. ++ Ruby 1.8, maybe even 1.6 or lower. No magic is involved. Works just fine with Ruby 1.9.1. == INSTALL: -+ sudo gem install minitest ++ sudo gem install minitest-deluxe == LICENSE: README.txt @@ -49,31 +49,35 @@ end module Kernel def describe desc, &block - stack = MiniTest::Spec.describe_stack - prev = MiniTest::Spec.description_stack.join(' ') - name = "#{prev} #{desc}".split(/\W+/).map { |s| s.capitalize }.join + "Spec" - cls = Object.class_eval "class #{name} < #{stack.last}; end; #{name}" + stack = MiniTest::Spec.context_stack + name = "#{MiniTest::Spec.full_description} #{desc}".split(/\W+/).map { |s| s.capitalize }.join + "Spec" + cls = Object.class_eval "class #{name} < #{stack.last.klass}; end; #{name}" cls.nuke_test_methods! - stack.push cls - MiniTest::Spec.description_stack.push desc + stack.push MiniTest::Spec::Context.new(cls, desc) cls.class_eval(&block) - MiniTest::Spec.description_stack.pop stack.pop end private :describe end class MiniTest::Spec < MiniTest::Unit::TestCase - @@describe_stack = [MiniTest::Spec] - def self.describe_stack - @@describe_stack + + class Context + attr_accessor :klass, :description + def initialize(klass, description) + @klass, @description = klass, description + end + end + + @@context_stack = [Context.new(MiniTest::Spec, nil)] + def self.context_stack + @@context_stack end - @@description_stack = [] - def self.description_stack - @@description_stack + def self.full_description + @@context_stack.map{|context| context.description }.compact.join(' ') end def self.current @@ -109,17 +113,20 @@ class MiniTest::Spec < MiniTest::Unit::TestCase raise "unsupported after type: #{type}" unless type == :each define_inheritable_method :teardown, &block end - + + def self.test_name_for(*name) + "test_#{[name].flatten.join(' ').gsub(/\W+/,'_')}" + end + def self.it desc, &block - define_method "test_#{description_stack.join(' ').gsub(/\W+/, '_')}_#{desc.gsub(/\W+/, '_').downcase}", &block + define_method test_name_for(full_description, desc), &block end # beacuse test names are really just comments, and therefore a code smell def self.expect(desc=nil, &block) @minitest_expectation_counter ||= 0; @minitest_expectation_counter += 1 desc ||= "[#{@minitest_expectation_counter}]" - name = ["test_", description_stack, desc].flatten.join(' ').gsub(/\W+/, '_').downcase - define_method name, &block + define_method test_name_for(full_description, desc), &block end end lib/minitest/spec.rb @@ -1,12 +1,12 @@ Gem::Specification.new do |s| - s.name = %q{minitest} - s.version = "1.4.2.3" + s.name = %q{minitest-deluxe} + s.version = "1.4.2.4" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Ryan Davis", "Matt Lyon"] - s.date = %q{2009-07-19} + s.date = %q{2009-11-02} s.description = %q{minitest/unit is a small and fast replacement for ruby's huge and slow test/unit. This is meant to be clean and easy to use both as a regular test writer and for language implementors that need a minimal set of methods to bootstrap a working unit test suite. mini/spec is a functionally complete spec engine. mini/mock, by Steven Baker, is a beautifully tiny mock object framework. (This package was called miniunit once upon a time) -- (this gem as maintained by Matt Lyon contains patches and extensions to minitest/spec that will apparently never make it upstream. Go Open Source!)} - s.summary = "minitest/unit is a small and fast replacement for ruby's huge and slow test/unit" + s.summary = "minitest is a small and fast replacement for ruby's huge and slow test/unit" s.email = %q{matt@flowerpowered.com} s.extra_rdoc_files = [ "README.txt", minitest.gemspec 5ecff2c276c5b6890b688397eea202c42d8cfbcf Matt Lyon matt@flowerpowered.com http://github.com/mattly/minitest/commit/386c29e79506847618608b8184e235b1dfbbdb9f 386c29e79506847618608b8184e235b1dfbbdb9f 2009-11-02T17:09:23-08:00 2009-11-02T17:09:23-08:00 a few updates 870124eb5f0e80a65e7aadd8ef717a0a262e9bf1 Matt Lyon matt@flowerpowered.com