spec 5.0.18 → 5.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccfcc8e1904aaae95d69f1595e96a0bc9e241b47
-  data.tar.gz: 5b9c315d81625b1f34862d39f8d218a79c769787
+  metadata.gz: 5038d9de846696ce5a2f21796e96617307552236
+  data.tar.gz: ccc9abc1332c91214faa8d35e3c89cb22976ea55
 SHA512:
-  metadata.gz: b66017678f7e5f4d4da15d4feeae02a727021f5f90213ae0d7911068a18067590d17758251a26429a4eb55d42b4976ffd6e01361805c2664f99dc611c60de42e
-  data.tar.gz: df2f66b6fb64f17492212dbdaa699a0d4147be5f2f4ea01ac911d36e7c26851b5d71c6c0b4d79431862363bf26f8cc57a6b0de7d9a6b7a411b936912c70d532d
+  metadata.gz: 7da9864a71d17f68ce58d957099918028d03b19a4bcc80961b4aa5397e14867db34c18f44a8a7ddb0dc5681f84b03b9547a0c59b49e98454cf58c9c7cafea731
+  data.tar.gz: 18330a6e213562aed882a7a31bec0d7b80607c3077375fa3fe62adf46d109debce732098ebe926d2fb843b7325116ac002009e210aa41412924c6adffc12ed90

data/lib/minitest.rb

@@ -5,8 +5,8 @@ require 'chronic_duration'
 # :include: README.txt
 
 module Minitest
-  VERSION = '5.0.18' # :nodoc:
-  DATE = '2013-08-13' # :nodoc:
+  VERSION = '5.0.19' # :nodoc:
+  DATE = '2013-08-19' # :nodoc:
 
   @@installed_at_exit ||= false
   @@after_run = []
@@ -148,8 +148,9 @@ module Minitest
     io = spec_opts.fetch(:io, $stdout)
     color = spec_opts.fetch(:color, "\e[32m") # ANSI.green default
     # target only existing readable files
-    files_to_trace.each { |f| targets.push(f) if File.exists?(f) && File
-    .readable?(f) }
+    files_to_trace.each do |f|
+      targets.push(File.expand_path(f)) if File.exists?(f) && File.readable?(f)
+    end
     return if targets.empty?
 
     set_trace_func(lambda do |event, file, line, id, binding, classname|
@@ -325,7 +326,9 @@ module Minitest
     class ExitAfterFirstFail < RuntimeError; end
 
     def self.check_failures result, reporter
-      if !result.failures.empty?
+      # skip is not a failure.
+      true_fails = result.failures.reject { |obj| obj.class == Minitest::Skip }
+      if !true_fails.empty?
         begin
           reporter.reporters.each { |r| r.report }
         ensure
@@ -651,7 +654,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
@@ -672,8 +675,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/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
@@ -289,4 +290,4 @@ require "minitest/expectations"
 
 class Object # :nodoc:
   include Minitest::Expectations unless ENV["MT_NO_EXPECTATIONS"]
-end
+end

data/release_notes.md

@@ -1,3 +1,10 @@
+#### v5.0.18 2013-08-13
+
+- [60c70b0](https://github.com/bootstraponline/spec/commit/60c70b0ef6005a515086467c1af3a9faedfb4da3) Release 5.0.18
+- [c0ebada](https://github.com/bootstraponline/spec/commit/c0ebada0543fb3d11ceb441cf17da91566119c41) Invoke after_run on Ctrl + C
+- [630edb2](https://github.com/bootstraponline/spec/commit/630edb2b45f3948ca0d465f29e1c198050fe0fb5) Fix exit
+
+
 #### v5.0.17 2013-08-12
 
 - [605696d](https://github.com/bootstraponline/spec/commit/605696d4952c9a8b9107e3a338c8713d6f979d18) Release 5.0.17

data/test/manual/skip.rb

@@ -0,0 +1,15 @@
+# encoding: utf-8
+
+require 'rubygems'
+require 'stringio' # stdlib
+require 'spec' # not 'minitest'
+
+describe 'a' do
+  t('') { puts 1 }
+  t('') { skip }
+  t('') { puts 3 }
+  t('') { skip }
+  t('') { puts 5 }
+end
+
+Minitest.run_specs({ trace: [__FILE__], verbose: true })

data/test/minitest/test_minitest_reporter.rb

@@ -66,7 +66,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
@@ -81,16 +85,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
@@ -248,10 +277,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:
@@ -263,6 +305,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

@@ -387,6 +387,8 @@ 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
@@ -408,7 +410,6 @@ class TestMinitestRunner < MetaMetaMetaTestCase
       #<Class:0xXXX>#test_something = 0.00 s = .
       #<Class:0xXXX>#test_skip = 0.00 s = S
 
-
       Finished in 0.00
 
         1) Skipped:
@@ -416,7 +417,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
       not yet
 
       2 runs, 1 assertions, 0 failures, 0 errors, 1 skips
-    EOM
+EOM
 
     assert_report expected, %w[--seed 42 --verbose]
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spec
 version: !ruby/object:Gem::Version
-  version: 5.0.18
+  version: 5.0.19
 platform: ruby
 authors:
 - code@bootstraponline.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2013-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic_duration
@@ -103,6 +103,7 @@ files:
 - test/manual/setup.rb
 - test/manual/simple.rb
 - test/manual/simple2.rb
+- test/manual/skip.rb
 - test/manual/t.rb
 - test/manual/trace.rb
 - test/manual/trace2.rb