minitest-hooks 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e8da883d698b9dd844a6ade834d4cc1caa51b53
-  data.tar.gz: 9453d5c0815b26d38bc061aafcf891a74c7ba1cb
+  metadata.gz: bc5ab13e6ee044a2863034efc3ac937a421a4db7
+  data.tar.gz: 51b6c4ea85b9eb707f89b781e686ccd9cee60fda
 SHA512:
-  metadata.gz: 0f4e94de8f4254c4b608beed79ba0e0de5dd0e62cdc87b53509352fcee4234d991b91d7f5734a8487881d9546fa75cb016e057e5e1692aa9b1380c130963e6e4
-  data.tar.gz: aeb69ca1c500fc8e8139855da189a6d06ba4e4bd35fa899c7978d84e8b481d026c493db2f9d0d4398c48b2aa788801cbe60b53658a1e3c68110a442d23a6d591
+  metadata.gz: f7574f8634e17b8d0cfb0c44afd963d075263edfce9f0773be50e3b9f7614c6f13787f4b78203b3fde86c045bcb5bb2f968ccb35b8ab734d4169f6c2e40771b3
+  data.tar.gz: 059e6099981202bcc989e42c5f9cee7f02d3fc3af4670a044dbd7f552229e2b3a43943e08aa0e3f4ac8cb4cae05b1799e15dfa729dadb81a8f5c03713487df42

data/CHANGELOG

@@ -1,3 +1,13 @@
+=== 1.1.0 (2015-05-11)
+
+* Remove unnecessary module inclusion (jeremyevans)
+
+* Add block-based around and around(:all) support (jeremyevans)
+
+=== 1.0.1 (2015-04-26)
+
+* Fix homepage in gemspec (jeremyevans)
+
 === 1.0.0 (2015-04-26)
 
 * Initial Public Release

data/README.rdoc

@@ -13,9 +13,9 @@ significantly speed up testing for specs that share expensive database setup cod
 
 Source code is available on GitHub at https://github.com/jeremyevans/minitest-hooks
 
-= Usage
+= Usage 
 
-== Using the library
+== In Specs (Minitest::Spec)
 
 === For all specs
 
@@ -27,7 +27,7 @@ First, you need to require the library.
 
   require 'minitest/hooks'
 
-Or you can set the default for some specs to be <tt>Minitest::HooksSpec</tt>:
+You can set the default for some specs to be <tt>Minitest::HooksSpec</tt>:
 
   MiniTest::Spec.register_spec_type(/something/, Minitest::HooksSpec)
 
@@ -37,10 +37,7 @@ Alternatively, you can include <tt>Minitest::Hooks</tt> in a specific spec class
     include Minitest::Hooks
   end
 
-But if you do this, you need to make sure that any +around+ and +around_all+
-methods defined in the class itself call +yield+ instead of +super+.
-
-== before_all Hooks
+=== before_all Hooks
 
 To run code before any specs in the suite are executed, pass +:all+ to +before+:
 
@@ -50,7 +47,7 @@ To run code before any specs in the suite are executed, pass +:all+ to +before+:
     end
   end
 
-== after_all Hooks
+=== after_all Hooks
 
 To run code after all specs in the suite are executed, pass +:all+ to +after+:
 
@@ -60,25 +57,65 @@ To run code after all specs in the suite are executed, pass +:all+ to +after+:
     end
   end
 
-== around Hooks
+=== around Hooks
 
-To run code around each spec in a suite, define the +around+ method and have it
+To run code around each spec in a suite, call +around+ with a block, and have the block
 call +super+:
 
   describe 'something' do
-    def around
+    around do |&block|
       DB.transaction(:rollback=>:always, :savepoint=>true, :auto_savepoint=>true) do
-        super
+        super(&block)
       end
     end
   end
 
-== around_all Hooks
+=== around_all Hooks
 
-To run code around all specs in a suite, define the +around_all+ method and have
-it call +super+:
+To run code around all specs in a suite, call <tt>around(:all)</tt> with a block,
+and have the block call +super+:
 
   describe 'something' do
+    around(:all) do |&block|
+      DB.transaction(:rollback=>:always) do
+        super(&block)
+      end
+    end
+  end
+
+=== In Tests (Minitest::Test)
+
+Create a subclass of <tt>Minitest::Test</tt> and include <tt>Minitest::Hooks</tt>,
+and have your test classes subclass from that subclass:
+
+  require 'minitest/hooks'
+  class MyTest < Minitest::Test
+    include Minitest::Hooks
+  end
+
+  class TestSuite1 < MyTest
+  end
+
+You can just define the +before_all+, +after_all+, +around+, and +around_all+ methods,
+instead of using the spec DSL.  Make sure to call super when overriding the methods.
+
+  class TestSuite1 < MyTest
+    def before_all
+      super
+      DB[:table].insert(:column=>1)
+    end
+
+    def after_all
+      DB[:table].delete
+      super
+    end
+
+    def around
+      DB.transaction(:rollback=>:always, :savepoint=>true, :auto_savepoint=>true) do
+        super
+      end
+    end
+
     def around_all
       DB.transaction(:rollback=>:always) do
         super

data/Rakefile

@@ -1,6 +1,5 @@
 require "rake"
 require "rake/clean"
-require 'rake/testtask'
 
 CLEAN.include ["minitest-hooks-*.gem", "rdoc", "coverage"]
 
@@ -13,7 +12,7 @@ end
 
 desc "Run specs"
 task :spec do
-  sh %{#{FileUtils::RUBY} -I lib spec/minitest_hooks_spec.rb}
+  sh %{#{FileUtils::RUBY} -I lib -e 'ARGV.each{|f| require f}' ./spec/*.rb}
 end
 
 task :default=>:spec

data/lib/minitest/hooks.rb

@@ -9,7 +9,6 @@ module Minitest::Hooks
   def self.included(mod)
     super
     mod.instance_exec do
-      include(@hooks_module ||= Module.new)
       extend(Minitest::Hooks::ClassMethods)
     end
   end
@@ -74,10 +73,16 @@ module Minitest::Hooks::ClassMethods
     r
   end
 
+  # If type is :all, set the around_all hook, otherwise set the around hook.
+  def around(type=nil, &block)
+    meth = type == :all ? :around_all : :around
+    define_method(meth, &block)
+  end
+
   # If type is :all, set the before_all hook instead of the before hook.
   def before(type=nil, &block)
     if type == :all
-      (defined?(@hooks_module) ? @hooks_module : self).send(:define_method, :before_all) do
+     define_method(:before_all) do
         super()
         instance_exec(&block)
       end
@@ -90,7 +95,7 @@ module Minitest::Hooks::ClassMethods
   # If type is :all, set the after_all hook instead of the after hook.
   def after(type=nil, &block)
     if type == :all
-      (defined?(@hooks_module) ? @hooks_module : self).send(:define_method, :after_all) do
+     define_method(:after_all) do
         instance_exec(&block)
         super()
       end

data/spec/minitest_hooks_direct_spec.rb

@@ -0,0 +1,117 @@
+require 'rubygems'
+require 'sequel'
+gem 'minitest'
+require 'minitest/autorun'
+require 'minitest/hooks'
+require 'logger'
+
+NDB = Sequel.connect(ENV['DATABASE_URL'] || 'sqlite:/')
+
+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_spec.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'sequel'
+gem 'minitest'
 require 'minitest/autorun'
 require 'minitest/hooks/default'
 require 'logger'
@@ -21,23 +22,23 @@ describe 'Minitest::Hooks with transactions/savepoints' do
   after(:all) do
     @ds_ba.count.must_equal 1 + @i
   end
-  def around
+  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
+      super(&block)
     end
     @ds_aa.count.must_equal 1 + @i
   end
-  def around_all
+  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
+      super(&block)
     end
     DB.table_exists?(:a).must_equal false
   end
@@ -68,25 +69,25 @@ describe 'Minitest::Hooks with transactions/savepoints' do
     after(:all) do
       @ds_ba2.count.must_equal 2
     end
-    def around
+    around do |&block|
       @ds_aa.count.must_equal 2
-      super do
+      super() do
         @ds_aa.count.must_equal 3
         @ds_ae3 = @ds_ae
         @ds_ae2 = @ds_aa2
         @ds_ae2.insert(1)
-        yield
+        block.call
         @ds_aa.count.must_equal 4
       end
       @ds_aa.count.must_equal 2
     end
-    def around_all
+    around(:all) do |&block|
       @i ||= 1
-      super do
+      super() do
         @ds_aa.count.must_equal 1
         @ds_aa2 = @ds_aa
         @ds_aa2.insert(1)
-        yield
+        block.call
         @ds_aa.count.must_equal 2
       end
       DB.table_exists?(:a).must_equal false

data/spec/minitest_hooks_test.rb

@@ -0,0 +1,125 @@
+require 'rubygems'
+require 'sequel'
+gem 'minitest'
+require 'minitest/autorun'
+require 'minitest/hooks'
+require 'logger'
+
+
+class MyTest < Minitest::Test
+  include Minitest::Hooks
+end
+
+class TestMinitestHooks < MyTest
+  DB = Sequel.connect(ENV['DATABASE_URL'] || 'sqlite:/')
+
+  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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minitest-hooks
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -71,7 +71,9 @@ files:
 - Rakefile
 - lib/minitest/hooks.rb
 - lib/minitest/hooks/default.rb
+- spec/minitest_hooks_direct_spec.rb
 - spec/minitest_hooks_spec.rb
+- spec/minitest_hooks_test.rb
 homepage: http://github.com/jeremyevans/minitest-hooks
 licenses:
 - MIT