theorem 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 510e3aaddc01eb3545cf4977b01d94b40940f390b9c8ddc91aa01db2eca6cf03
-  data.tar.gz: 357e1c62b31bd700fa3aff4671dedb777867e3879f5de8ab4738535ab0e4c726
+  metadata.gz: 482c54bf255ca8192a63190101ea3ff32aaf902d37c6badae8e52966d2222d66
+  data.tar.gz: 8728e81f43d1acbc6f99a553de5400d253325e9b8ba13ba5d788be817c6f0f42
 SHA512:
-  metadata.gz: 4f7d8754fc5e3549ce677098c348d4d8aa7dc03018337d44634adcf1ff932bd0ad8666ae0faef01f2c95d4508e11450075cee5fc500b87a67cc66f6313a80dfd
-  data.tar.gz: 6d0333b789ea2e2d13707be0039533421ce65bef5b9b55064cc6683ac15323900a7040d23a34218d1a05858c150d60cded6445f440448a41c6ec68c4b5bf02f0
+  metadata.gz: 9d8a3adabb93286bfcc8679e9437378c36c447395fa3d7e51e39d26cfd56d17dec529cc1ce30bd5ac9d805a7bba952521afca39bceb546f44168a2068a28bf76
+  data.tar.gz: 0efadbdc23011608363b7ca4b617fbcb0e103045104e23a71e2aca10554a1a8e44a3912ce6e07aba9211919c5d07738da314361546ced2454f43ca239cf810de

data/src/theorem/beaker.rb

@@ -50,6 +50,14 @@ module Theorem
         @state = []
       end
 
+      def reverse_run!(ctx)
+        ctx.instance_exec @state.reverse, ctx do |state, ctx|
+          state.each do |b|
+            ctx.instance_eval &b
+          end
+        end
+      end
+
       def run!(ctx)
         ctx.instance_exec @state, ctx do |state, ctx|
           state.each do |b|
@@ -62,8 +70,8 @@ module Theorem
         @state.empty?
       end
 
-      def reverse_prepare(&block)
-        @state.unshift block
+      def concat(beaker)
+        @state.concat beaker.instance_variable_get('@state')
       end
 
       def prepare(&block)

data/src/theorem/let.rb

@@ -4,7 +4,6 @@ module Theorem
   module Control
     # compatibility with let in rspec
     module Let
-
       def let(name, &block)
         setup_let(name, &block)
         instance_exec @let_registry do |registry|
@@ -25,7 +24,6 @@ module Theorem
 
       def let_it_be(name, &block)
         setup_let(name, :let_it_be, &block)
-        something = binding
         instance_exec @let_registry do |registry|
           @before_all.prepare do
             define_singleton_method name do

data/src/theorem/test.rb

@@ -33,19 +33,20 @@ module Theorem
     # module
     module ClassMethods
       def inherited(klass)
+        klass.extend ClassMethods
         klass.include(control)
         klass.instance_exec self do |me|
           @parent_before_all ||= []
-          @parent_before_all << me.before_all_beaker
+          @before_all.concat me.before_all_beaker
 
           @parent_before_each ||= []
-          @parent_before_each << me.before_each_beaker
+          @before_each.concat me.before_each_beaker
 
           @parent_after_each ||= []
-          @parent_after_each.unshift me.after_each_beaker
+          @after_each.concat me.after_each_beaker
 
           @parent_after_all ||= []
-          @parent_after_all.unshift me.after_all_beaker
+          @after_all.concat me.after_all_beaker
         end
         super
       end
@@ -63,11 +64,11 @@ module Theorem
       end
 
       def after_each(&block)
-        @after_each.reverse_prepare(&block)
+        @after_each.prepare(&block)
       end
 
       def after_all(&block)
-        @after_all.reverse_prepare(&block)
+        @after_all.prepare(&block)
       end
 
       def experiments(klass, **opts, &block)
@@ -104,6 +105,8 @@ module Theorem
       end
 
       def run!
+        return [] if @tests.empty?
+
         test_case = new
 
         # run before all beakers to create state in test case
@@ -183,11 +186,7 @@ module Theorem
       end
 
       def run_after_all_beakers(results, test_case)
-        @after_all.run!(test_case)
-
-        @parent_after_all&.each do |beaker|
-          beaker.run!(test_case)
-        end
+        @after_all.reverse_run!(test_case)
 
         []
       rescue Exception => error
@@ -202,11 +201,7 @@ module Theorem
       end
 
       def run_after_each_beakers(test_case)
-        @after_each.run!(test_case)
-
-        @parent_after_each&.each do |beaker|
-          beaker.run!(test_case)
-        end
+        @after_each.reverse_run!(test_case)
         nil
       rescue Exception => error
         Theorem.handle_exception(error)
@@ -215,9 +210,6 @@ module Theorem
       end
 
       def run_before_each_beakers(test_case)
-        @parent_before_each&.each do |beaker|
-          beaker.run!(test_case)
-        end
         @before_each.run!(test_case)
         nil
       rescue Exception => error
@@ -227,9 +219,6 @@ module Theorem
       end
 
       def run_before_all_beakers(test_case)
-        @parent_before_all&.each do |beaker|
-          beaker.run!(test_case)
-        end
         @before_all.run!(test_case)
         []
       rescue Exception => error

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: theorem
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Sean Gregory
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-11 00:00:00.000000000 Z
+date: 2022-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: extended_dir