minitest 5.0.6 → 5.0.7

data/History.txt

@@ -1,3 +1,15 @@
+=== 5.0.7 / 2013-09-05
+
+* 2 minor enhancements:
+
+  * Added clarification about the use of thread local variables in expectations. (jemc)
+  * Added extra message about skipped tests, if any. Disable globally with $MT_NO_SKIP_MSG.
+
+* 2 bug fixes:
+
+  * Only require minitest, not minitest/autorun in pride_plugin. (judofyr)
+  * Require rubygems in load_plugins in case you're not using minitest/autorun.
+
 === 5.0.6 / 2013-06-28
 
 * 3 minor enhancements:

data/README.txt

@@ -366,6 +366,16 @@ you want to extend your test using setup/teardown via a module, just
 make sure you ALWAYS call super. before/after automatically call super
 for you, so make sure you don't do it twice.
 
+== Prominent Projects using Minitest:
+
+* arel
+* journey
+* mime-types
+* nokogiri
+* rails (active_support et al)
+* rake
+* rdoc
+
 == Known Extensions:
 
 capybara_minitest_spec      :: Bridge between Capybara RSpec matchers and MiniTest::Spec expectations (e.g. page.must_have_content("Title")).

data/Rakefile

@@ -1,7 +1,5 @@
 # -*- ruby -*-
 
-$TESTING_MINIUNIT = true
-
 require 'rubygems'
 require 'hoe'
 
@@ -14,10 +12,6 @@ Hoe.spec 'minitest' do
   self.testlib = :minitest
 end
 
-def loc dir
-  system "find #{dir} -name \\*.rb | xargs wc -l | tail -1"
-end
-
 desc "Find missing expectations"
 task :specs do
   $:.unshift "lib"
@@ -69,26 +63,4 @@ task :specs do
   end
 end
 
-desc "stupid line count"
-task :dickwag do
-  puts
-  puts "miniunit"
-  puts
-  print " lib  loc"; loc "lib"
-  print " test loc"; loc "test"
-  print " totl loc"; loc "lib test"
-  print " flog = "; system "flog -s lib"
-
-  puts
-  puts "test/unit"
-  puts
-  Dir.chdir File.expand_path("~/Work/svn/ruby/ruby_1_8") do
-    print " lib  loc"; loc "lib/test"
-    print " test loc"; loc "test/testunit"
-    print " totl loc"; loc "lib/test test/testunit"
-    print " flog = "; system "flog -s lib/test"
-  end
-  puts
-end
-
 # vim: syntax=Ruby

data/lib/minitest.rb

@@ -4,7 +4,7 @@ require "optparse"
 # :include: README.txt
 
 module Minitest
-  VERSION = "5.0.6" # :nodoc:
+  VERSION = "5.0.7" # :nodoc:
 
   @@installed_at_exit ||= false
   @@after_run = []
@@ -70,6 +70,8 @@ module Minitest
 
     seen = {}
 
+    require "rubygems" unless defined? Gem
+
     Gem.find_files("minitest/*_plugin.rb").each do |plugin_path|
       name = File.basename plugin_path, "_plugin.rb"
 
@@ -519,7 +521,7 @@ module Minitest
 
       io.sync = self.old_sync
 
-      io.puts # finish the dots
+      io.puts unless options[:verbose] # finish the dots
       io.puts
       io.puts statistics
       io.puts aggregated_results
@@ -541,8 +543,13 @@ module Minitest
     end
 
     def summary # :nodoc:
-      "%d runs, %d assertions, %d failures, %d errors, %d skips" %
-        [count, assertions, failures, errors, skips]
+      extra = ""
+
+      extra = "\n\nYou have skipped tests. Run with --verbose for details." if
+        results.any?(&:skipped?) unless options[:verbose] or ENV["MT_NO_SKIP_MSG"]
+
+      "%d runs, %d assertions, %d failures, %d errors, %d skips%s" %
+        [count, assertions, failures, errors, skips, extra]
     end
   end
 

data/lib/minitest/expectations.rb

@@ -1,5 +1,18 @@
 ##
 # It's where you hide your "assertions".
+#
+# Please note, because of the way that expectations are implemented,
+# all expectations (eg must_equal) are dependent upon a thread local
+# variable +:current_spec+. If your specs rely on mixing threads into
+# the specs themselves, you're better off using assertions. For
+# example:
+#
+#     it "should still work in threads" do
+#       my_threaded_thingy do
+#         (1+1).must_equal 2  # bad
+#         assert_equal 2, 1+1 # good
+#       end
+#     end
 
 module Minitest::Expectations
   ##

data/lib/minitest/pride_plugin.rb

@@ -1,4 +1,4 @@
-require "minitest/autorun"
+require "minitest"
 
 module Minitest
   def self.plugin_pride_options opts, options # :nodoc:

data/lib/minitest/spec.rb

@@ -53,7 +53,8 @@ module Kernel # :nodoc:
   #
   # but do note that several items there are debatable or specific to
   # rspec.
-
+  #
+  # For more information about expectations, see Minitest::Expectations.
 
   def describe desc, additional_desc = nil, &block # :doc:
     stack = Minitest::Spec.describe_stack

data/test/minitest/test_minitest_mock.rb

@@ -109,7 +109,7 @@ class TestMinitestMock < Minitest::Test
   end
 
   def test_expectations_can_be_satisfied_via_public_send
-    skip if RUBY_VERSION < "1.9"
+    skip "Doesn't run on 1.8" if RUBY_VERSION < "1.9"
 
     @mock.public_send :foo
     @mock.public_send :meaning_of_life
@@ -309,6 +309,31 @@ class TestMinitestMock < Minitest::Test
 
     assert_equal exp, e.message
   end
+
+  def test_mock_called_via_send
+    mock = Minitest::Mock.new
+    mock.expect(:foo, true)
+
+    mock.send :foo
+    mock.verify
+  end
+
+  def test_mock_called_via___send__
+    mock = Minitest::Mock.new
+    mock.expect(:foo, true)
+
+    mock.__send__ :foo
+    mock.verify
+  end
+
+  def test_mock_called_via_send_with_args
+    mock = Minitest::Mock.new
+    mock.expect(:foo, true, [1,2,3])
+
+    mock.send(:foo, 1, 2, 3)
+    mock.verify
+  end
+
 end
 
 require "minitest/metametameta"

data/test/minitest/test_minitest_reporter.rb

@@ -65,7 +65,11 @@ class TestMinitestReporter < Minitest::Test
   def skip_test
     unless defined? @st then
       @st = Minitest::Test.new(:woot)
-      @st.failures << Minitest::Skip.new
+      @st.failures << begin
+                        raise Minitest::Skip
+                      rescue Minitest::Assertion => e
+                        e
+                      end
     end
     @st
   end
@@ -80,16 +84,41 @@ class TestMinitestReporter < Minitest::Test
     refute r.passed?
   end
 
+  SKIP_MSG = "\n\nYou have skipped tests. Run with --verbose for details."
+
   def test_passed_eh_error
+    r.start
+
     r.results << error_test
 
     refute r.passed?
+
+    r.report
+
+    refute_match SKIP_MSG, io.string
   end
 
   def test_passed_eh_skipped
+    r.start
     r.results << skip_test
+    assert r.passed?
+
+    restore_env do
+      r.report
+    end
+
+    assert_match SKIP_MSG, io.string
+  end
 
+  def test_passed_eh_skipped_verbose
+    r.first.options[:verbose] = true
+
+    r.start
+    r.results << skip_test
     assert r.passed?
+    r.report
+
+    refute_match SKIP_MSG, io.string
   end
 
   def test_start
@@ -247,10 +276,23 @@ class TestMinitestReporter < Minitest::Test
     assert_equal exp, normalize_output(io.string)
   end
 
+  def restore_env
+    old_value = ENV["MT_NO_SKIP_MSG"]
+    ENV.delete "MT_NO_SKIP_MSG"
+    
+    yield
+  ensure
+    ENV["MT_NO_SKIP_MSG"] = old_value
+  end
+
+
   def test_report_skipped
     r.start
     r.record skip_test
-    r.report
+
+    restore_env do
+      r.report
+    end
 
     exp = clean <<-EOM
       Run options:
@@ -262,6 +304,8 @@ class TestMinitestReporter < Minitest::Test
       Finished in 0.00
 
       1 runs, 0 assertions, 0 failures, 0 errors, 1 skips
+
+      You have skipped tests. Run with --verbose for details.
     EOM
 
     assert_equal exp, normalize_output(io.string)

data/test/minitest/test_minitest_unit.rb

@@ -368,6 +368,15 @@ class TestMinitestRunner < MetaMetaMetaTestCase
     assert_report expected
   end
 
+  def restore_env
+    old_value = ENV["MT_NO_SKIP_MSG"]
+    ENV.delete "MT_NO_SKIP_MSG"
+
+    yield
+  ensure
+    ENV["MT_NO_SKIP_MSG"] = old_value
+  end
+
   def test_run_skip
     @tu =
     Class.new Minitest::Test do
@@ -386,9 +395,13 @@ class TestMinitestRunner < MetaMetaMetaTestCase
       Finished in 0.00
 
       2 runs, 1 assertions, 0 failures, 0 errors, 1 skips
+
+      You have skipped tests. Run with --verbose for details.
     EOM
 
-    assert_report expected
+    restore_env do
+      assert_report expected
+    end
   end
 
   def test_run_skip_verbose
@@ -407,7 +420,6 @@ class TestMinitestRunner < MetaMetaMetaTestCase
       #<Class:0xXXX>#test_skip = 0.00 s = S
       #<Class:0xXXX>#test_something = 0.00 s = .
 
-
       Finished in 0.00
 
         1) Skipped:
@@ -702,8 +714,8 @@ class TestMinitestUnitTestCase < Minitest::Test
   end
 
   def teardown
-    # assert_equal(@assertion_count, @tc._assertions,
-    #              "expected #{@assertion_count} assertions to be fired during the test, not #{@tc._assertions}") if @tc.passed?
+    assert_equal(@assertion_count, @tc.assertions,
+                 "expected #{@assertion_count} assertions to be fired during the test, not #{@tc.assertions}") if @tc.passed?
   end
 
   def non_verbose
@@ -891,6 +903,8 @@ class TestMinitestUnitTestCase < Minitest::Test
   end
 
   def test_delta_consistency
+    @assertion_count = 2
+
     @tc.assert_in_delta 0, 1, 1
 
     util_assert_triggered "Expected |0 - 1| (1) to not be <= 1." do
@@ -923,6 +937,8 @@ class TestMinitestUnitTestCase < Minitest::Test
   end
 
   def test_epsilon_consistency
+    @assertion_count = 2
+
     @tc.assert_in_epsilon 1.0, 1.001
 
     msg = "Expected |1.0 - 1.001| (0.000999xxx) to not be <= 0.001."
@@ -1355,7 +1371,6 @@ class TestMinitestUnitTestCase < Minitest::Test
 
   def test_capture_subprocess_io
     @assertion_count = 0
-    skip "Dunno why but the parallel run of this fails"
 
     non_verbose do
       out, err = capture_subprocess_io do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: minitest
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 5
   - 0
-  - 6
-  version: 5.0.6
+  - 7
+  version: 5.0.7
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2013-06-28 00:00:00 Z
+date: 2013-09-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rdoc
@@ -61,11 +61,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 9
         segments: 
         - 3
-        - 6
-        version: "3.6"
+        - 7
+        version: "3.7"
   type: :development
   version_requirements: *id002
 description: |-
@@ -161,8 +161,8 @@ files:
 - test/minitest/test_minitest_unit.rb
 - .gemtest
 homepage: https://github.com/seattlerb/minitest
-licenses: []
-
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: 
 - --main