minitest-hooks 1.4.2 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cab2b3cd7d0bc63cc18436e87e08ff392e9facfc
-  data.tar.gz: 82eed894ed6beab837d83fd94a64ab3c36e1acb4
+SHA256:
+  metadata.gz: a525a80546faf2287ec0c0b8f5423a93bf76195381aec4bb37ab04ea6a533a71
+  data.tar.gz: 8e6c6bd1f68db59ad2a6c885f6aba06b38f0302c8ecda20981381fd9e6683550
 SHA512:
-  metadata.gz: fa12984df59acb3da5d4d038f2d5aa83b758724a5f7a2d258f6f82ddc5d23d7afc739eaaa9b09bdd72befa7f040f693a398ced29b3086e6ef9278118753975bb
-  data.tar.gz: b2e8f5f4bdf2e1283711cb2b947da5ea5526eaf7e00bd2ec0912011764203c16f7ba376011df4898a4bb8108599b6e416b447859838af44d7adf229f89d152ee
+  metadata.gz: c6ba36dfb0477f1a7a15579b791ee73c6a5f3bf56157a115f7eaa14c40763e5244e2eb3e6f774fbfdc0cdbc6a7f31a8595bd95a59042889e974acb45c3210c9e
+  data.tar.gz: e56c3ed65969f299e59030a590a207a56519180843221a55635c6db58fd8dd5f9b0d339af7cfecfcfee10ec1272b2353349d89048df06f25f99680b49cbeaf87

data/CHANGELOG

@@ -1,3 +1,13 @@
+=== 1.5.1 (2023-07-27)
+
+* Do not include specs or Rakefile in the gem (jeremyevans)
+
+* Fix use with minitest 5.19+ by using Minitest instead of MiniTest as the constant (jeremyevans)
+
+=== 1.5.0 (2018-05-21)
+
+* Fix use with minitest 5.11+ by using Minitest::Result in such cases (GUI) (#15)
+
 === 1.4.2 (2017-09-12)
 
 * Don't modify test instance name if before_all/after_all cause an error (jeremyevans) (#14)

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2015,2017 Jeremy Evans
+Copyright (c) 2015-2023 Jeremy Evans
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

data/README.rdoc

@@ -29,7 +29,7 @@ First, you need to require the library.
 
 You can set the default for some specs to be <tt>Minitest::HooksSpec</tt>:
 
-  MiniTest::Spec.register_spec_type(/something/, Minitest::HooksSpec)
+  Minitest::Spec.register_spec_type(/something/, Minitest::HooksSpec)
 
 Alternatively, you can include <tt>Minitest::Hooks</tt> in a specific spec class:
 

data/lib/minitest/hooks/default.rb

@@ -1,3 +1,3 @@
 require 'minitest/hooks'
 
-MiniTest::Spec.register_spec_type(//, Minitest::HooksSpec)
+Minitest::Spec.register_spec_type(//, Minitest::HooksSpec)

data/lib/minitest/hooks/test.rb

@@ -64,40 +64,39 @@ module Minitest::Hooks::ClassMethods
   def with_info_handler(reporter, &block)
     @instance = new(NEW)
     @instance.time = 0
-    description = respond_to?(:desc) ? desc : name
-    @instance.name = "#{description}#around_all"
+    @instance.name = "around_all"
    
     begin
       @instance.around_all do
         begin
           @instance.capture_exceptions do
-            @instance.name = "#{description}#before_all"
+            @instance.name = "before_all"
             @instance.before_all
           end
 
           if @instance.failure
             failed = true
-            reporter.record @instance
+            _record_minitest_hooks_error(reporter, @instance)
           else
             super(reporter, &block)
           end
         ensure
           @instance.capture_exceptions do
-            @instance.name = "#{description}#after_all" unless failed
+            @instance.name = "after_all" unless failed
             @instance.after_all
           end
           if @instance.failure && !failed
             failed = true
-            reporter.record @instance
+            _record_minitest_hooks_error(reporter, @instance)
           end
-          @instance.name = "#{description}#around_all" unless failed
+          @instance.name = "around_all" unless failed
         end
       end
     rescue => e
       @instance.capture_exceptions do
         raise e
       end
-      reporter.record @instance
+      _record_minitest_hooks_error(reporter, @instance)
     end
   end
 
@@ -132,4 +131,19 @@ module Minitest::Hooks::ClassMethods
       super
     end
   end
+
+  private
+
+  def _record_minitest_hooks_error(reporter, instance)
+    # In Minitest 5.11+, use Minitest::Result for wrapping the object to send
+    # to the reporter.
+    if(defined?(Minitest::Result))
+      result = Minitest::Result.from(instance)
+    # :nocov:
+    else
+      result = instance
+    # :nocov:
+    end
+    reporter.record result
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minitest-hooks
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.1
 platform: ruby
 authors:
 - Jeremy Evans
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-09-12 00:00:00.000000000 Z
+date: 2023-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '5'
-  type: :development
+        version: '5.3'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-global_expectations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   minitest-hooks adds around and before_all/after_all/around_all hooks for Minitest.
   This allows you do things like run each suite of specs inside a database transaction,
@@ -82,23 +96,14 @@ files:
 - CHANGELOG
 - MIT-LICENSE
 - README.rdoc
-- Rakefile
 - 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
-- spec/minitest_hooks_direct_spec.rb
-- spec/minitest_hooks_errors_spec.rb
-- spec/minitest_hooks_spec.rb
-- spec/minitest_hooks_test.rb
 homepage: http://github.com/jeremyevans/minitest-hooks
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--quiet"
 - "--line-numbers"
@@ -120,9 +125,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Around and before_all/after_all/around_all hooks for Minitest
 test_files: []

data/Rakefile

@@ -1,45 +0,0 @@
-require "rake"
-require "rake/clean"
-
-CLEAN.include ["minitest-hooks-*.gem", "rdoc", "coverage"]
-
-desc "Build minitest-hooks gem"
-task :package=>[:clean] do |p|
-  sh %{#{FileUtils::RUBY} -S gem build minitest-hooks.gemspec}
-end
-
-### Specs
-
-desc "Run specs"
-task :spec do
-  sh %{#{FileUtils::RUBY} spec/all.rb}
-end
-
-task :default=>:spec
-
-### RDoc
-
-RDOC_DEFAULT_OPTS = ["--quiet", "--line-numbers", "--inline-source", '--title', 'minitest-hooks: around and before_all/after_all/around_all hooks for Minitest']
-
-begin
-  gem 'hanna-nouveau'
-  RDOC_DEFAULT_OPTS.concat(['-f', 'hanna'])
-rescue Gem::LoadError
-end
-
-rdoc_task_class = begin
-  require "rdoc/task"
-  RDoc::Task
-rescue LoadError
-  require "rake/rdoctask"
-  Rake::RDocTask
-end
-
-RDOC_OPTS = RDOC_DEFAULT_OPTS + ['--main', 'README.rdoc']
-
-rdoc_task_class.new do |rdoc|
-  rdoc.rdoc_dir = "rdoc"
-  rdoc.options += RDOC_OPTS
-  rdoc.rdoc_files.add %w"README.rdoc CHANGELOG MIT-LICENSE lib/**/*.rb"
-end
-

data/spec/all.rb

@@ -1,4 +0,0 @@
-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

@@ -1,42 +0,0 @@
-require './spec/helper'
-require 'minitest/hooks/default'
-
-error = ENV['MINITEST_HOOKS_ERRORS']
-
-describe 'Minitest::Hooks error handling' do
-  before(:all) do
-    raise if error == 'before-all'
-  end
-  before do
-    raise if error == 'before'
-  end
-  after do
-    raise if error == 'after'
-  end
-  after(:all) do
-    raise if error == 'after-all'
-  end
-  around do |&block|
-    raise if error == 'around-before'
-    super(&block)
-    raise if error == 'around-after'
-  end
-  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
-
-  3.times do |i|
-    it "should work try #{i}" do
-    end
-  end
-end

data/spec/helper.rb

@@ -1,6 +0,0 @@
-$:.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

@@ -1,42 +0,0 @@
-require './spec/helper'
-require 'minitest/hooks/default'
-
-describe 'Minitest::Hooks error handling' do
-  before(:all) do
-    name.must_equal 'Minitest::Hooks error handling#before_all'
-  end
-  after(:all) do
-    name.must_equal 'Minitest::Hooks error handling#after_all'
-  end
-  around(:all) do |&block|
-    name.must_equal 'Minitest::Hooks error handling#around_all'
-    super(&block)
-    name.must_equal 'Minitest::Hooks error handling#around_all'
-  end
-
-  3.times do |i|
-    it "should work try #{i}" 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,113 +0,0 @@
-require './spec/helper'
-require 'minitest/hooks'
-
-NDB = Sequel.connect(DATABASE_URL)
-
-MiniTest::Spec.register_spec_type(/no_default/, Minitest::Spec)
-
-describe 'Minitest::Hooks with transactions/savepoints no_default' do
-  include Minitest::Hooks
-
-  before(:all) do
-    @ds_ba = @ds_aa
-    @ds_ba.count.must_equal 1 + @i
-  end
-  before do
-    @ds_be = @ds_ae
-    @ds_be.count.must_equal 2 + @i * 2
-  end
-  after do
-    @ds_be.count.must_equal 2 + @i * 2
-  end
-  after(:all) do
-    @ds_ba.count.must_equal 1 + @i
-  end
-  around do |&block|
-    @ds_aa.count.must_equal 1 + @i
-    NDB.transaction(:rollback=>:always, :savepoint=>true, :auto_savepoint=>true) do
-      @ds_ae = @ds_aa
-      @ds_ae.insert(1)
-      super(&block)
-    end
-    @ds_aa.count.must_equal 1 + @i
-  end
-  around(:all) do |&block|
-    @i ||= 0
-    NDB.transaction(:rollback=>:always) do
-      NDB.create_table(:a){Integer :a}
-      @ds_aa = NDB[:a]
-      @ds_aa.count.must_equal 0
-      @ds_aa.insert(1)
-      super(&block)
-    end
-    NDB.table_exists?(:a).must_equal false
-  end
-
-  3.times do |i|
-    it "should work try #{i}" do
-      @ds_aa.count.must_equal 2
-      @ds_ae.count.must_equal 2
-      @ds_ba.count.must_equal 2
-      @ds_be.count.must_equal 2
-    end
-  end
-
-  describe "in nested describe" do
-    before(:all) do
-      @ds_ba3 = @ds_ba
-      @ds_ba2 = @ds_aa2
-      @ds_ba2.count.must_equal 2
-    end
-    before do
-      @ds_be3 = @ds_be
-      @ds_be2 = @ds_ae2
-      @ds_be2.count.must_equal 4
-    end
-    after do
-      @ds_be2.count.must_equal 4
-    end
-    after(:all) do
-      @ds_ba2.count.must_equal 2
-    end
-    around do |&block|
-      @ds_aa.count.must_equal 2
-      super() do
-        @ds_aa.count.must_equal 3
-        @ds_ae3 = @ds_ae
-        @ds_ae2 = @ds_aa2
-        @ds_ae2.insert(1)
-        block.call
-        @ds_aa.count.must_equal 4
-      end
-      @ds_aa.count.must_equal 2
-    end
-    around(:all) do |&block|
-      @i ||= 1
-      super() do
-        @ds_aa.count.must_equal 1
-        @ds_aa2 = @ds_aa
-        @ds_aa2.insert(1)
-        block.call
-        @ds_aa.count.must_equal 2
-      end
-      NDB.table_exists?(:a).must_equal false
-    end
-
-    3.times do |i|
-      it "should work try #{i}" do
-        @ds_aa.count.must_equal 4
-        @ds_ae.count.must_equal 4
-        @ds_ba.count.must_equal 4
-        @ds_be.count.must_equal 4
-        @ds_aa2.count.must_equal 4
-        @ds_ae2.count.must_equal 4
-        @ds_ba2.count.must_equal 4
-        @ds_be2.count.must_equal 4
-        @ds_ae3.count.must_equal 4
-        @ds_ba3.count.must_equal 4
-        @ds_be3.count.must_equal 4
-      end
-    end
-  end
-end
-

data/spec/minitest_hooks_errors_spec.rb

@@ -1,27 +0,0 @@
-require './spec/helper'
-require 'minitest/hooks/default'
-require 'open3'
-
-RUBY = ENV['RUBY'] || 'ruby'
-
-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", "-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
-      end
-    end
-  end
-
-  run_test "before-all", 1, 1
-  run_test "before", 3, 3
-  run_test "after", 3, 3
-  run_test "after-all", 4, 1
-  run_test "around-before", 1, 1
-  run_test "around-after", 1, 1
-  run_test "around-all-before", 1, 1
-  run_test "around-all-after", 4, 1
-end

data/spec/minitest_hooks_spec.rb

@@ -1,108 +0,0 @@
-require './spec/helper'
-require 'minitest/hooks/default'
-
-DB = Sequel.connect(DATABASE_URL)
-
-describe 'Minitest::Hooks with transactions/savepoints' do
-  before(:all) do
-    @ds_ba = @ds_aa
-    @ds_ba.count.must_equal 1 + @i
-  end
-  before do
-    @ds_be = @ds_ae
-    @ds_be.count.must_equal 2 + @i * 2
-  end
-  after do
-    @ds_be.count.must_equal 2 + @i * 2
-  end
-  after(:all) do
-    @ds_ba.count.must_equal 1 + @i
-  end
-  around do |&block|
-    @ds_aa.count.must_equal 1 + @i
-    DB.transaction(:rollback=>:always, :savepoint=>true, :auto_savepoint=>true) do
-      @ds_ae = @ds_aa
-      @ds_ae.insert(1)
-      super(&block)
-    end
-    @ds_aa.count.must_equal 1 + @i
-  end
-  around(:all) do |&block|
-    @i ||= 0
-    DB.transaction(:rollback=>:always) do
-      DB.create_table(:a){Integer :a}
-      @ds_aa = DB[:a]
-      @ds_aa.count.must_equal 0
-      @ds_aa.insert(1)
-      super(&block)
-    end
-    DB.table_exists?(:a).must_equal false
-  end
-
-  3.times do |i|
-    it "should work try #{i}" do
-      @ds_aa.count.must_equal 2
-      @ds_ae.count.must_equal 2
-      @ds_ba.count.must_equal 2
-      @ds_be.count.must_equal 2
-    end
-  end
-
-  describe "in nested describe" do
-    before(:all) do
-      @ds_ba3 = @ds_ba
-      @ds_ba2 = @ds_aa2
-      @ds_ba2.count.must_equal 2
-    end
-    before do
-      @ds_be3 = @ds_be
-      @ds_be2 = @ds_ae2
-      @ds_be2.count.must_equal 4
-    end
-    after do
-      @ds_be2.count.must_equal 4
-    end
-    after(:all) do
-      @ds_ba2.count.must_equal 2
-    end
-    around do |&block|
-      @ds_aa.count.must_equal 2
-      super() do
-        @ds_aa.count.must_equal 3
-        @ds_ae3 = @ds_ae
-        @ds_ae2 = @ds_aa2
-        @ds_ae2.insert(1)
-        block.call
-        @ds_aa.count.must_equal 4
-      end
-      @ds_aa.count.must_equal 2
-    end
-    around(:all) do |&block|
-      @i ||= 1
-      super() do
-        @ds_aa.count.must_equal 1
-        @ds_aa2 = @ds_aa
-        @ds_aa2.insert(1)
-        block.call
-        @ds_aa.count.must_equal 2
-      end
-      DB.table_exists?(:a).must_equal false
-    end
-
-    3.times do |i|
-      it "should work try #{i}" do
-        @ds_aa.count.must_equal 4
-        @ds_ae.count.must_equal 4
-        @ds_ba.count.must_equal 4
-        @ds_be.count.must_equal 4
-        @ds_aa2.count.must_equal 4
-        @ds_ae2.count.must_equal 4
-        @ds_ba2.count.must_equal 4
-        @ds_be2.count.must_equal 4
-        @ds_ae3.count.must_equal 4
-        @ds_ba3.count.must_equal 4
-        @ds_be3.count.must_equal 4
-      end
-    end
-  end
-end

data/spec/minitest_hooks_test.rb

@@ -1,120 +0,0 @@
-require './spec/helper'
-require 'minitest/hooks/test'
-
-class MyTest < Minitest::Test
-  include Minitest::Hooks
-end
-
-class TestMinitestHooks < MyTest
-  DB = Sequel.connect(DATABASE_URL)
-
-  def before_all
-    super
-    @ds_ba = @ds_aa
-    assert_equal @ds_ba.count, 1 + @i
-  end
-  def setup
-    super
-    @ds_be = @ds_ae
-    assert_equal @ds_be.count, 2 + @i * 2
-  end
-  def teardown
-    assert_equal @ds_be.count, 2 + @i * 2
-    super
-  end
-  def after_all
-    assert_equal @ds_ba.count, 1 + @i
-    super
-  end
-  def around
-    assert_equal @ds_aa.count, 1 + @i
-    DB.transaction(:rollback=>:always, :savepoint=>true, :auto_savepoint=>true) do
-      @ds_ae = @ds_aa
-      @ds_ae.insert(1)
-      super
-    end
-    assert_equal @ds_aa.count, 1 + @i
-  end
-  def around_all
-    @i ||= 0
-    DB.transaction(:rollback=>:always) do
-      DB.create_table(:a){Integer :a}
-      @ds_aa = DB[:a]
-      assert_equal @ds_aa.count, 0
-      @ds_aa.insert(1)
-      super
-    end
-    assert_equal DB.table_exists?(:a), false
-  end
-
-  3.times do |i|
-    define_method(:"test_should_work_#{i}") do
-      assert_equal @ds_aa.count, 2
-      assert_equal @ds_ae.count, 2
-      assert_equal @ds_ba.count, 2
-      assert_equal @ds_be.count, 2
-    end
-  end
-
-  class TestMinitestHooks2 < self
-    def before_all
-      super
-      @ds_ba3 = @ds_ba
-      @ds_ba2 = @ds_aa2
-      assert_equal @ds_ba2.count, 2
-    end
-    def setup
-      super
-      @ds_be3 = @ds_be
-      @ds_be2 = @ds_ae2
-      assert_equal @ds_be2.count, 4
-    end
-    def teardown
-      assert_equal @ds_be2.count, 4
-      super
-    end
-    def after_all
-      assert_equal @ds_ba2.count, 2
-      super
-    end
-    def around
-      assert_equal @ds_aa.count, 2
-      super do
-        assert_equal @ds_aa.count, 3
-        @ds_ae3 = @ds_ae
-        @ds_ae2 = @ds_aa2
-        @ds_ae2.insert(1)
-        yield
-        assert_equal @ds_aa.count, 4
-      end
-      assert_equal @ds_aa.count, 2
-    end
-    def around_all
-      @i ||= 1
-      super do
-        assert_equal @ds_aa.count, 1
-        @ds_aa2 = @ds_aa
-        @ds_aa2.insert(1)
-        yield
-        assert_equal @ds_aa.count, 2
-      end
-      assert_equal DB.table_exists?(:a), false
-    end
-
-    3.times do |i|
-      define_method(:"test_should_work_#{i}") do
-        assert_equal @ds_aa.count, 4
-        assert_equal @ds_ae.count, 4
-        assert_equal @ds_ba.count, 4
-        assert_equal @ds_be.count, 4
-        assert_equal @ds_aa2.count, 4
-        assert_equal @ds_ae2.count, 4
-        assert_equal @ds_ba2.count, 4
-        assert_equal @ds_be2.count, 4
-        assert_equal @ds_ae3.count, 4
-        assert_equal @ds_ba3.count, 4
-        assert_equal @ds_be3.count, 4
-      end
-    end
-  end
-end