test-prof 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edd58f04fbf02f8bfa863b2c68e19f26fbdfb95c36bb361d012848f0a4f76790
-  data.tar.gz: 820c00eeaaea782bc89581005ac83cc147551550477519d7dd1a59a212f497c9
+  metadata.gz: f26a5003d400d430571206914f2f15a94ef4cca220c5f359e315eda7adf7a6b9
+  data.tar.gz: 74d5cfb5e92351e628134dcd51230c6c984bd4b03518b89b4f98d8d20621e46f
 SHA512:
-  metadata.gz: f999f2073374210ef7c2afbedc977c21210f69e6e180fb54f6ce452741db1841b396b9358c9892e85ae972019d7204676d8a906d6a9f1f896c3669249027c935
-  data.tar.gz: 38c1f0d45d386acca3edbbd7c52b9d246f02f030cce0717f2480b2917b003c6f2b3542beb6caac45d8fe432bc69b6a7db1720768297eb4a1588f471727664409
+  metadata.gz: ea8cd4e7907fceb36874a91240be7baa0bdfb3c43dbddda21dececde541dbe5b9d52738ef3412c9c906e208fe5d33d2b34ce4e13a9063d941f360f2ccb845a30
+  data.tar.gz: b87bec660bcd642dced3582c147317bb575628ef264eb7a33e31b59a1f5f7b740423fbd0a08dddf6c28638ffe266b460b05524cbfabbf95a93105053876aaf05

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## master (unrealeased)
 
+## 1.0.6 (2021-06-23)
+
+- Fix Spring detection when `DISABLE_SPRING=1` is used. ([@palkan][])
+
+- Make `before_all` in Minitest inheritable. ([@palkan][])
+
 ## 1.0.5 (2021-05-13)
 
 - Fix logging regression when no newline has been added. ([@palkan][])
@@ -178,7 +184,7 @@ end
 ```
 
 - Print warning when `ActiveRecordSharedConnection` is used in the version of Rails
-supporting `lock_threads` (5.1+). ([@palkan][])
+  supporting `lock_threads` (5.1+). ([@palkan][])
 
 ## 0.9.0 (2019-05-14)
 
@@ -236,20 +242,20 @@ See [changelog](https://github.com/test-prof/test-prof/blob/v0.8.0/CHANGELOG.md)
 [@palkan]: https://github.com/palkan
 [@marshall-lee]: https://github.com/marshall-lee
 [@danielwestendorf]: https://github.com/danielwestendorf
-[@Shkrt]: https://github.com/Shkrt
-[@IDolgirev]: https://github.com/IDolgirev
+[@shkrt]: https://github.com/Shkrt
+[@idolgirev]: https://github.com/IDolgirev
 [@desoleary]: https://github.com/desoleary
 [@rabotyaga]: https://github.com/rabotyaga
-[@Vasfed]: https://github.com/Vasfed
+[@vasfed]: https://github.com/Vasfed
 [@szemek]: https://github.com/szemek
 [@mkldon]: https://github.com/mkldon
 [@dmagro]: https://github.com/dmagro
 [@danielwaterworth]: https://github.com/danielwaterworth
-[@Envek]: https://github.com/Envek
+[@envek]: https://github.com/Envek
 [@tyleriguchi]: https://github.com/tyleriguchi
 [@lostie]: https://github.com/lostie
 [@pirj]: https://github.com/pirj
-[@LynxEyes]: https://github.com/LynxEyes
+[@lynxeyes]: https://github.com/LynxEyes
 [@stefkin]: https://github.com/stefkin
 [@jaimerson]: https://github.com/jaimerson
 [@alexvko]: https://github.com/alexvko

data/lib/test_prof.rb

@@ -46,6 +46,13 @@ module TestProf
       defined?(Minitest)
     end
 
+    # Returns true if Spring is used and not disabled
+    def spring?
+      # See https://github.com/rails/spring/blob/577cf01f232bb6dbd0ade7df2df2ac209697e741/lib/spring/binstub.rb
+      disabled = ENV["DISABLE_SPRING"]
+      defined?(::Spring::Application) && (disabled.nil? || disabled.empty? || disabled == "0")
+    end
+
     # Returns the current process time
     def now
       Process.clock_gettime(Process::CLOCK_MONOTONIC)
@@ -65,7 +72,7 @@ module TestProf
     # equal to the provided value (if any).
     # Contains workaround for applications using Spring.
     def activate(env_var, val = nil)
-      if defined?(::Spring::Application)
+      if spring?
         notify_spring_detected
         ::Spring.after_fork do
           activate!(env_var, val) do

data/lib/test_prof/recipes/minitest/before_all.rb

@@ -9,13 +9,15 @@ module TestProf
     module Minitest # :nodoc: all
       class Executor
         attr_reader :active, :block, :captured_ivars, :teardown_block, :current_test_object,
-          :setup_fixtures
+          :setup_fixtures, :parent
 
         alias_method :active?, :active
         alias_method :setup_fixtures?, :setup_fixtures
 
-        def initialize(setup_fixtures: false, &block)
-          @setup_fixtures = setup_fixtures
+        def initialize(setup_fixtures: false, parent: nil, &block)
+          @parent = parent
+          # Fixtures must be instantiated if any of the executors needs them
+          @setup_fixtures = setup_fixtures || parent&.setup_fixtures
           @block = block
           @captured_ivars = []
         end
@@ -28,7 +30,9 @@ module TestProf
           @current_test_object = test_object
 
           return restore_ivars(test_object) if active?
+
           @active = true
+
           BeforeAll.setup_fixtures(test_object) if setup_fixtures?
           BeforeAll.begin_transaction do
             capture!(test_object)
@@ -36,20 +40,20 @@ module TestProf
         end
 
         def deactivate!
+          return unless active
+
           @active = false
 
-          current_test_object&.instance_eval(&teardown_block) if teardown_block
+          perform_teardown(current_test_object)
 
           @current_test_object = nil
           BeforeAll.rollback_transaction
         end
 
         def capture!(test_object)
-          return unless block
-
           before_ivars = test_object.instance_variables
 
-          test_object.instance_eval(&block)
+          perform_setup(test_object)
 
           (test_object.instance_variables - before_ivars).each do |ivar|
             captured_ivars << [ivar, test_object.instance_variable_get(ivar)]
@@ -64,6 +68,16 @@ module TestProf
             )
           end
         end
+
+        def perform_setup(test_object)
+          parent&.perform_setup(test_object)
+          test_object.instance_eval(&block) if block
+        end
+
+        def perform_teardown(test_object)
+          current_test_object&.instance_eval(&teardown_block) if teardown_block
+          parent&.perform_teardown(test_object)
+        end
       end
 
       class << self
@@ -73,10 +87,25 @@ module TestProf
       end
 
       module ClassMethods
-        attr_accessor :before_all_executor
+        attr_writer :before_all_executor
+
+        def before_all_executor
+          return @before_all_executor if instance_variable_defined?(:@before_all_executor)
+
+          @before_all_executor = if superclass.respond_to?(:before_all_executor)
+            superclass.before_all_executor
+          end
+        end
 
         def before_all(setup_fixtures: BeforeAll.config.setup_fixtures, &block)
-          self.before_all_executor = Executor.new(setup_fixtures: setup_fixtures, &block)
+          self.before_all_executor = Executor.new(
+            setup_fixtures: setup_fixtures,
+            parent: before_all_executor,
+            &block
+          )
+
+          # Do not add patches multiple times
+          return if before_all_executor.parent
 
           prepend(Module.new do
             def before_setup
@@ -95,7 +124,7 @@ module TestProf
         end
 
         def after_all(&block)
-          self.before_all_executor ||= Executor.new
+          self.before_all_executor = Executor.new(parent: before_all_executor)
           before_all_executor.teardown(&block)
         end
       end

data/lib/test_prof/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TestProf
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-prof
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-13 00:00:00.000000000 Z
+date: 2021-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler