minitest-suite_callbacks 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a8179e88e90edd230281e82dd434e3d4408b3c3
-  data.tar.gz: b272d88b7a19a3d7371660dec2e77e71570186be
+  metadata.gz: 029402ce9007c610b3b062614b6637f57813ddc0
+  data.tar.gz: 9401049b7d036592f8ea7cd98dbc9648a4c6bf36
 SHA512:
-  metadata.gz: 325840ce50324be88cc50596d8b0b7d8e0cea15547295c049711d9415f68ec72e7a8daff86d08be33d3652d3cc9b9368b6061d979af8af4c3d22136feb4bf5e6
-  data.tar.gz: 66e13b0d486a2b5a6c974c2925a7e2a701c81c61c07b9e741a593c37361f06fbd168bb5235507a2fd300277b46d5660f1c0c7da6cff4efd358342ad682e83036
+  metadata.gz: 32a11cc44a5243542c91cb0772ccd352202ade4fdab6ade4be11c2d3553f4267898e2ab22ebd22161e69aa223682007fcd84398d9f68631069be510d8e00b32c
+  data.tar.gz: 4768466c103aa42148daefd2d1247ae59d341cfb959a058a0090d534be408f2f4585374f3db1a8117246c454cec075c8f79229b78ff4bac703953d89c4aa8e55

data/lib/minitest/suite_callbacks.rb

@@ -4,56 +4,78 @@
 # It just doesn't work at all with contexts & suite-wide setup
 module Minitest::SuiteCallbacks
   def self.extended(base)
-    base.class_eval do
-      class << self
-        attr_reader :sandbox
+    class << base
+      attr_reader :sandbox
+      attr_accessor :counter
 
-        # DSL method
-        def before_suite(&before_suite_proc)
-          @before_suite_proc = before_suite_proc
-          # Setup state before suite
-          context = self
-          original_singleton_run = method(:run)
-          define_singleton_method :run do |*args, &block|
-            context.setup_before_suite
-            original_singleton_run.call(*args, &block)
-          end
-
-          # TODO what if we call before_suite multiple times?
-          original_instance_run = instance_method(:run)
+      # Define before_suite on the test class context
+      def before_suite(&before_suite_proc)
+        # Setup state before suite
+        context = self
+        singleton_class.class_eval do
+          original_singleton_run = instance_method(:run)
+          # Wrap the run method on the singleton class of the test class
           define_method :run do |*args, &block|
-            context.transfer_sandbox_state_to(self)
-            original_instance_run.bind(self).call(*args, &block)
+            # TODO this is kind of hacky; it only runs before_suite once
+            # I don't think this will support other use cases (e.g. multiple before_suites/nested before_suites)
+            context.instance_eval do
+              if @sandbox.nil?
+                @sandbox = new('sandbox')
+                @sandbox.instance_eval &before_suite_proc
+              end
+            end
+            original_singleton_run.bind(self).call(*args, &block)
           end
         end
 
-        def after_suite(&after_suite_proc)
-          context = self
-          original_singleton_run = method(:run)
-          define_singleton_method :run do |*args, &block|
-            original_singleton_run.call(*args, &block)
-            context.sandbox.instance_eval &after_suite_proc
-          end
+        # TODO what if we call before_suite multiple times?
+        original_instance_run = instance_method(:run)
+        define_method :run do |*args, &block|
+          context.transfer_sandbox_state_to(self)
+          original_instance_run.bind(self).call(*args, &block)
         end
+      end
 
-        def setup_before_suite
-          @sandbox = new('sandbox')
-          @sandbox.instance_eval &@before_suite_proc
+      # TODO: because of how Minitest separates its suites, this method gets called after EACH suite, 
+      # not after all related suites are finished
+      def after_suite(&after_suite_proc)
+        @counter = 0
+        context = self
+        singleton_class.class_eval do
+          original_singleton_run = instance_method(:run)
+          define_method :run do |*args, &block|
+            original_singleton_run.bind(self).call(*args, &block)
+            context.instance_eval do
+              @counter += 1
+              if has_run_all_related_suites?
+                @sandbox.instance_eval &after_suite_proc
+              end
+            end
+          end
         end
+      end
 
-        def transfer_sandbox_state_to(dest_context)
-          # TODO: generate these
-          ivs_to_skip = [:@NAME, :@assertions, :@failures]
-          iv_map = {}
-          @sandbox.instance_variables.each do |iv|
-            next if ivs_to_skip.include?(iv)
-            iv_map[iv] = @sandbox.instance_variable_get(iv.to_sym)
-          end
-          
-          dest_context.instance_eval do
-            iv_map.each do |k, v|
-              instance_variable_set k, v
-            end
+      def has_run_all_related_suites?
+        # Get the number of subclasses + the class itself
+        @counter == descendant_count + 1
+      end
+
+      def descendant_count
+        ObjectSpace.each_object(::Class).select{|k| k < self}.size
+      end
+
+      def transfer_sandbox_state_to(dest_context)
+        # TODO: generate these
+        ivs_to_skip = [:@NAME, :@assertions, :@failures]
+        iv_map = {}
+        @sandbox.instance_variables.each do |iv|
+          next if ivs_to_skip.include?(iv)
+          iv_map[iv] = @sandbox.instance_variable_get(iv.to_sym)
+        end
+        
+        dest_context.instance_eval do
+          iv_map.each do |k, v|
+            instance_variable_set k, v
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest-suite_callbacks
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - backupify