minitest 5.0.4 → 5.0.5

data/.autotest

@@ -6,12 +6,26 @@ require 'autotest/rcov' if ENV['RCOV']
 Autotest.add_hook :initialize do |at|
   at.testlib = 'minitest/autorun'
 
-  at.extra_class_map["MiniTest::Spec"]           = "test/test_minitest_spec.rb"
-  at.extra_class_map["TestMeta"]                 = "test/test_minitest_spec.rb"
-  at.extra_class_map["TestMiniTestUnitTestCase"] = "test/test_minitest_unit.rb"
-  at.extra_class_map["TestMiniTestUnit"]         = "test/test_minitest_unit.rb"
-  at.extra_class_map["TestMiniTestUnitRecording"]= "test/test_minitest_unit.rb"
-  at.extra_class_map["TestMiniTestStub"]         = "test/test_minitest_mock.rb"
+  bench_tests = %w(TestMinitestBenchmark)
+  mock_tests = %w(TestMinitestMock TestMinitestStub)
+  spec_tests = %w(TestMinitestReporter TestMetaStatic TestMeta
+                  TestSpecInTestCase)
+  unit_tests = %w(TestMinitestGuard TestMinitestRunnable
+                  TestMinitestRunner TestMinitestTest TestMinitestUnit
+                  TestMinitestUnitInherited TestMinitestUnitOrder
+                  TestMinitestUnitRecording TestMinitestUnitTestCase)
+
+  {
+    bench_tests => "test/minitest/test_minitest_benchmark.rb",
+    mock_tests  => "test/minitest/test_minitest_mock.rb",
+    spec_tests  => "test/minitest/test_minitest_reporter.rb",
+    unit_tests  => "test/minitest/test_minitest_unit.rb",
+  }.each do |klasses, file|
+    klasses.each do |klass|
+      at.extra_class_map[klass] = file
+    end
+  end
+
   at.add_exception 'coverage.info'
   at.add_exception 'coverage'
 end

data/History.txt

@@ -1,3 +1,14 @@
+=== 5.0.5 / 2013-06-20
+
+* 6 bug fixes:
+
+  * DOH! Fixed the rest of the new casing on Minitest. (splattael)
+  * Fixed typo on minitest/mock rdoc. (mrgilman/guiceolin)
+  * Make Spec::DSL.describe_stack thread local to avoid failing on my own tests.
+  * Make a fake Time.now local to the tests so they won't interfere with real reporter timings.
+  * Make everything mockable by wrapping all 'special' methods in a smarter wrapper. (bestie)
+  * Raise ArgumentError if let name starts with 'test'. (johnmaxwell)
+
 === 5.0.4 / 2013-06-07
 
 * 5 minor enhancements:

data/README.txt

@@ -194,7 +194,7 @@ Output is tab-delimited to make it easy to paste into a spreadsheet.
 
   describe MemeAsker do
     before do
-      @meme = MiniTest::Mock.new
+      @meme = Minitest::Mock.new
       @meme_asker = MemeAsker.new @meme
     end
 
@@ -328,18 +328,18 @@ Expectations are put on Object (one level down) so the Worker
 fails.
 
 You can bypass `SimpleDelegate#method_missing` by extending the worker
-with `MiniTest::Expectations`. You can either do that in your setup at
+with `Minitest::Expectations`. You can either do that in your setup at
 the instance level, like:
 
     before do
       @worker = Worker.new(Object.new)
-      @worker.extend MiniTest::Expectations
+      @worker.extend Minitest::Expectations
     end
 
 or you can extend the Worker class (within the test file!), like:
 
     class Worker
-      include ::MiniTest::Expectations
+      include ::Minitest::Expectations
     end
 
 === How to share code across test classes?

data/Rakefile

@@ -38,8 +38,8 @@ task :specs do
     /must_raises/                          => 'must_raise',
   }
 
-  expectations = MiniTest::Expectations.public_instance_methods.map(&:to_s)
-  assertions   = MiniTest::Assertions.public_instance_methods.map(&:to_s)
+  expectations = Minitest::Expectations.public_instance_methods.map(&:to_s)
+  assertions   = Minitest::Assertions.public_instance_methods.map(&:to_s)
 
   assertions.sort.each do |assertion|
     expectation = case assertion
@@ -63,7 +63,7 @@ task :specs do
     puts
     puts "##"
     puts "# :method: #{expectation}"
-    puts "# See MiniTest::Assertions##{assertion}"
+    puts "# See Minitest::Assertions##{assertion}"
     puts
     puts "infect_an_assertion #{args.join ", "}"
   end

data/design_rationale.rb

@@ -26,7 +26,7 @@ end                                    #     assert_equal 2, 2
 ###############################################################################
 # The specs generate:
 
-class ThingySpec < MiniTest::Spec
+class ThingySpec < Minitest::Spec
   def setup
     super
     do_some_setup

data/lib/minitest.rb

@@ -4,7 +4,7 @@ require "optparse"
 # :include: README.txt
 
 module Minitest
-  VERSION = "5.0.4" # :nodoc:
+  VERSION = "5.0.5" # :nodoc:
 
   @@installed_at_exit ||= false
   @@after_run = []

data/lib/minitest/mock.rb

@@ -10,10 +10,28 @@ module Minitest # :nodoc:
   class Mock
     alias :__respond_to? :respond_to?
 
-    skip_methods = %w(object_id respond_to_missing? inspect === to_s)
+    overridden_methods = %w(
+      ===
+      inspect
+      object_id
+      public_send
+      respond_to_missing?
+      send
+      to_s
+    )
 
     instance_methods.each do |m|
-      undef_method m unless skip_methods.include?(m.to_s) || m =~ /^__/
+      undef_method m unless overridden_methods.include?(m.to_s) || m =~ /^__/
+    end
+
+    overridden_methods.map(&:to_sym).each do |method_id|
+      define_method method_id do |*args, &b|
+        if @expected_calls.has_key? method_id then
+          method_missing(method_id, *args, &b)
+        else
+          super(*args, &b)
+        end
+      end
     end
 
     def initialize # :nodoc:
@@ -42,11 +60,13 @@ module Minitest # :nodoc:
     #   @mock.uses_any_string("foo") # => true
     #   @mock.verify  # => true
     #
-    #   @mock.expect(:uses_one_string, true, ["foo"]
+    #   @mock.expect(:uses_one_string, true, ["foo"])
     #   @mock.uses_one_string("bar") # => true
     #   @mock.verify  # => raises MockExpectationError
 
     def expect(name, retval, args=[], &blk)
+      name = name.to_sym
+
       if block_given?
         raise ArgumentError, "args ignored when block given" unless args.empty?
         @expected_calls[name] << { :retval => retval, :block => blk }
@@ -138,7 +158,7 @@ module Minitest # :nodoc:
     end
 
     def respond_to?(sym, include_private = false) # :nodoc:
-      return true if @expected_calls.has_key?(sym.to_sym)
+      return true if @expected_calls.has_key? sym.to_sym
       return __respond_to?(sym, include_private)
     end
   end

data/lib/minitest/spec.rb

@@ -143,9 +143,8 @@ class Minitest::Spec < Minitest::Test
       }.last
     end
 
-    @@describe_stack = []
     def describe_stack # :nodoc:
-      @@describe_stack
+      Thread.current[:describe_stack] ||= []
     end
 
     ##
@@ -223,6 +222,7 @@ class Minitest::Spec < Minitest::Test
     # Why use let instead of def? I honestly don't know.
 
     def let name, &block
+      raise ArgumentError, 'name cannot begin with "test"' if name.to_s =~ /\Atest/
       define_method name do
         @_memoized ||= {}
         @_memoized.fetch(name) { |k| @_memoized[k] = instance_eval(&block) }

data/test/minitest/test_minitest_mock.rb

@@ -74,6 +74,49 @@ class TestMinitestMock < Minitest::Test
     assert mock.verify
   end
 
+  def test_set_expectation_on_special_methods
+    mock = Minitest::Mock.new
+
+    mock.expect :object_id, "received object_id"
+    assert_equal "received object_id", mock.object_id
+
+    mock.expect :respond_to_missing?, "received respond_to_missing?"
+    assert_equal "received respond_to_missing?", mock.respond_to_missing?
+
+    mock.expect :===, "received ==="
+    assert_equal "received ===", mock.===
+
+    mock.expect :inspect, "received inspect"
+    assert_equal "received inspect", mock.inspect
+
+    mock.expect :to_s, "received to_s"
+    assert_equal "received to_s", mock.to_s
+
+    mock.expect :public_send, "received public_send"
+    assert_equal "received public_send", mock.public_send
+
+    mock.expect :send, "received send"
+    assert_equal "received send", mock.send
+
+    assert mock.verify
+  end
+
+  def test_expectations_can_be_satisfied_via_send
+    @mock.send :foo
+    @mock.send :meaning_of_life
+
+    assert @mock.verify
+  end
+
+  def test_expectations_can_be_satisfied_via_public_send
+    skip if RUBY_VERSION < "1.9"
+
+    @mock.public_send :foo
+    @mock.public_send :meaning_of_life
+
+    assert @mock.verify
+  end
+
   def test_blow_up_on_wrong_arguments
     @mock.foo
     @mock.meaning_of_life
@@ -286,18 +329,22 @@ class TestMinitestStub < Minitest::Test
     assert_equal @assertion_count, @tc.assertions
   end
 
+  class Time
+    def self.now
+      24
+    end
+  end
+
   def assert_stub val_or_callable
     @assertion_count += 1
 
-    Minitest::Test.synchronize do
-      t = Time.now.to_i
-
-      Time.stub :now, val_or_callable do
-        @tc.assert_equal 42, Time.now
-      end
+    t = Time.now.to_i
 
-      @tc.assert_operator Time.now.to_i, :>=, t
+    Time.stub :now, val_or_callable do
+      @tc.assert_equal 42, Time.now
     end
+
+    @tc.assert_operator Time.now.to_i, :>=, t
   end
 
   def test_stub_private_module_method
@@ -345,15 +392,13 @@ class TestMinitestStub < Minitest::Test
   def test_stub_block_args
     @assertion_count += 1
 
-    Minitest::Test.synchronize do
-      t = Time.now.to_i
+    t = Time.now.to_i
 
-      Time.stub :now,  lambda { |n| n * 2 } do
-        @tc.assert_equal 42, Time.now(21)
-      end
-
-      @tc.assert_operator Time.now.to_i, :>=, t
+    Time.stub :now,  lambda { |n| n * 2 } do
+      @tc.assert_equal 42, Time.now(21)
     end
+
+    @tc.assert_operator Time.now.to_i, :>=, t
   end
 
   def test_stub_callable

data/test/minitest/test_minitest_spec.rb

@@ -551,6 +551,12 @@ describe Minitest::Spec, :let do
 
     _count.must_equal 2
   end
+
+  it 'raises an error if the name begins with "test"' do
+    describe "let" do
+      proc { let(:test_value) { true } }.must_raise ArgumentError
+    end
+  end
 end
 
 describe Minitest::Spec, :subject do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: minitest
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 5
   - 0
-  - 4
-  version: 5.0.4
+  - 5
+  version: 5.0.5
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2013-06-07 00:00:00 Z
+date: 2013-06-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rdoc