minitest-hooks 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d783ae841e96a694f434edcdc954f1ba84d55dcf
-  data.tar.gz: 834f32299a9ac3543d5bb54fc6c70981f36b5f53
+  metadata.gz: cab2b3cd7d0bc63cc18436e87e08ff392e9facfc
+  data.tar.gz: 82eed894ed6beab837d83fd94a64ab3c36e1acb4
 SHA512:
-  metadata.gz: d2ffd54816bc6486818e5f48b242029a9b6f8224be7b4b1deb3c804e30712947d2522805c91fef6a9917a37335e2affd352c9f5ea21a42ec0523dc3b4d556b4e
-  data.tar.gz: bc165e9d45529d4fdedcd7efa8b244d34cfa7c0429283ff2d8a735501b7aba8230573f67f315b689d925450e2179c492d4532974d029939495f1303045d1b9e0
+  metadata.gz: fa12984df59acb3da5d4d038f2d5aa83b758724a5f7a2d258f6f82ddc5d23d7afc739eaaa9b09bdd72befa7f040f693a398ced29b3086e6ef9278118753975bb
+  data.tar.gz: b2e8f5f4bdf2e1283711cb2b947da5ea5526eaf7e00bd2ec0912011764203c16f7ba376011df4898a4bb8108599b6e416b447859838af44d7adf229f89d152ee

data/CHANGELOG

@@ -1,3 +1,11 @@
+=== 1.4.2 (2017-09-12)
+
+* Don't modify test instance name if before_all/after_all cause an error (jeremyevans) (#14)
+
+* Set around_all test instance name to strings so that exceptions in {before,after,around}_all don't break reporters (jeremyevans) (#14)
+
+* Set time to 0 for around_all test instance so that exceptions in {before,after,around}_all don't break reporters (jeremyevans) (#13, #14)
+
 === 1.4.1 (2017-07-31)
 
 * Set test/spec name correctly when running before(:all)/after(:all)/around(:all) hooks (rcrogers, jeremyevans) (#12)

data/Rakefile

@@ -12,9 +12,7 @@ end
 
 desc "Run specs"
 task :spec do
-  ENV['RUBY'] = FileUtils::RUBY
-  ENV['RUBYLIB'] = "lib:#{ENV['RUBYLIB']}"
-  sh %{#{FileUtils::RUBY} -I lib -e 'ARGV.each{|f| require f}' ./spec/*.rb}
+  sh %{#{FileUtils::RUBY} spec/all.rb}
 end
 
 task :default=>:spec

data/lib/minitest/hooks/test.rb

@@ -49,7 +49,7 @@ module Minitest::Hooks::ClassMethods
   # Unless name is NEW, return a dup singleton instance.
   def new(name)
     if name.equal?(NEW)
-      return super(:around_all)
+      return super('around_all')
     end
 
     instance = @instance.dup
@@ -63,14 +63,15 @@ module Minitest::Hooks::ClassMethods
   # dup of the singleton instance.
   def with_info_handler(reporter, &block)
     @instance = new(NEW)
-    inside = false
+    @instance.time = 0
+    description = respond_to?(:desc) ? desc : name
+    @instance.name = "#{description}#around_all"
    
     begin
       @instance.around_all do
-        inside = true
         begin
           @instance.capture_exceptions do
-            @instance.name = :before_all
+            @instance.name = "#{description}#before_all"
             @instance.before_all
           end
 
@@ -82,15 +83,14 @@ module Minitest::Hooks::ClassMethods
           end
         ensure
           @instance.capture_exceptions do
-            @instance.name = :after_all
+            @instance.name = "#{description}#after_all" unless failed
             @instance.after_all
           end
           if @instance.failure && !failed
             failed = true
             reporter.record @instance
           end
-          @instance.name = :around_all
-          inside = false
+          @instance.name = "#{description}#around_all" unless failed
         end
       end
     rescue => e

data/spec/all.rb

@@ -0,0 +1,4 @@
+require 'rbconfig'
+ENV['RUBY'] ||= ENV["RUBY"] || File.join(RbConfig::CONFIG["bindir"], RbConfig::CONFIG["ruby_install_name"] + RbConfig::CONFIG["EXEEXT"]).sub(/.*\s.*/m, '"\&"')
+ENV['RUBYLIB'] = "lib:#{ENV['RUBYLIB']}"
+Dir['./spec/*_spec.rb'].each{|f| require f}

data/spec/errors/example.rb

@@ -24,6 +24,14 @@ describe 'Minitest::Hooks error handling' do
   around(:all) do |&block|
     raise if error == 'around-all-before'
     super(&block)
+    case error
+    when 'before-all'
+      name.must_equal 'Minitest::Hooks error handling#before_all'
+    when 'after-all'
+      name.must_equal 'Minitest::Hooks error handling#after_all'
+    else
+      name.must_equal 'Minitest::Hooks error handling#around_all'
+    end
     raise if error == 'around-all-after'
   end
 

data/spec/helper.rb

@@ -1,4 +1,6 @@
+$:.unshift(File.join(File.dirname(File.expand_path(__FILE__)), "../lib/"))
 require 'rubygems'
 require 'sequel'
 gem 'minitest'
 require 'minitest/autorun'
+DATABASE_URL = ENV['DATABASE_URL'] || (defined?(JRUBY_VERSION) ? 'jdbc:sqlite::memory:' : 'sqlite:/')

data/spec/minitest_hooks_all_name_spec.rb

@@ -3,17 +3,15 @@ require 'minitest/hooks/default'
 
 describe 'Minitest::Hooks error handling' do
   before(:all) do
-    name.must_equal :before_all
+    name.must_equal 'Minitest::Hooks error handling#before_all'
   end
   after(:all) do
-    name.must_equal :after_all
-  end
-  around do |&block|
+    name.must_equal 'Minitest::Hooks error handling#after_all'
   end
   around(:all) do |&block|
-    name.must_equal :around_all
+    name.must_equal 'Minitest::Hooks error handling#around_all'
     super(&block)
-    name.must_equal :around_all
+    name.must_equal 'Minitest::Hooks error handling#around_all'
   end
 
   3.times do |i|
@@ -21,3 +19,24 @@ describe 'Minitest::Hooks error handling' do
     end
   end
 end
+
+class MinitestHooksNameTest < Minitest::Test
+  include Minitest::Hooks
+
+  def before_all
+    assert_equal 'MinitestHooksNameTest#before_all', name
+  end
+  def after_all
+    assert_equal 'MinitestHooksNameTest#after_all', name
+  end
+  def around_all
+    assert_equal 'MinitestHooksNameTest#around_all', name
+    super
+    assert_equal 'MinitestHooksNameTest#around_all', name
+  end
+
+  3.times do |i|
+    define_method "test_should_work_try_#{i}" do
+    end
+  end
+end

data/spec/minitest_hooks_direct_spec.rb

@@ -1,7 +1,7 @@
 require './spec/helper'
 require 'minitest/hooks'
 
-NDB = Sequel.connect(ENV['DATABASE_URL'] || 'sqlite:/')
+NDB = Sequel.connect(DATABASE_URL)
 
 MiniTest::Spec.register_spec_type(/no_default/, Minitest::Spec)
 

data/spec/minitest_hooks_errors_spec.rb

@@ -8,7 +8,7 @@ describe 'Minitest::Hooks error handling' do
   def self.run_test(desc, runs, errors)
     it "should handle errors in #{desc}" do
       ENV['MINITEST_HOOKS_ERRORS'] = desc
-      Open3.popen3(RUBY, "spec/errors/example.rb") do  |_, o, e, w|
+      Open3.popen3(RUBY, "spec/errors/example.rb", "-v") do  |_, o, e, w|
         o.read.must_match /#{runs} runs, 0 assertions, 0 failures, #{errors} errors, 0 skips/
         e.read.must_equal ''
         w.value.exitstatus.wont_equal 0 if w

data/spec/minitest_hooks_spec.rb

@@ -1,7 +1,7 @@
 require './spec/helper'
 require 'minitest/hooks/default'
 
-DB = Sequel.connect(ENV['DATABASE_URL'] || 'sqlite:/')
+DB = Sequel.connect(DATABASE_URL)
 
 describe 'Minitest::Hooks with transactions/savepoints' do
   before(:all) do

data/spec/minitest_hooks_test.rb

@@ -6,7 +6,7 @@ class MyTest < Minitest::Test
 end
 
 class TestMinitestHooks < MyTest
-  DB = Sequel.connect(ENV['DATABASE_URL'] || 'sqlite:/')
+  DB = Sequel.connect(DATABASE_URL)
 
   def before_all
     super

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minitest-hooks
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-31 00:00:00.000000000 Z
+date: 2017-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -86,6 +86,7 @@ files:
 - lib/minitest/hooks.rb
 - lib/minitest/hooks/default.rb
 - lib/minitest/hooks/test.rb
+- spec/all.rb
 - spec/errors/example.rb
 - spec/helper.rb
 - spec/minitest_hooks_all_name_spec.rb
@@ -120,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Around and before_all/after_all/around_all hooks for Minitest