spectre-core 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e75cee429c0765480965f1e1177c85f5ecf769651332e7167b1be5db8601cda
-  data.tar.gz: 6ad3c26cf386b69b57db775bec8fb8e1ae011a8d6abfb21a1aa250fec6198104
+  metadata.gz: 0c4d07c24a6be8fbf1ed1ff1b4ec52860294be4b4c2d8580facf183231a3c4ed
+  data.tar.gz: 576889b489206a424462b087bc75590aa17339b918c4bc1076f072ceab2c29af
 SHA512:
-  metadata.gz: '09f0c500ce8ed1416a418b75af0716a6f7bd1083abf3b2d402c0adf381c0ce60bf51e8cb8e06f6f26bb5d19c1c3e8d8034361bcc320821f82835d39b427189f5'
-  data.tar.gz: 23d0113096cb9b69f78f40b1ae5ad7c6aa9201593fa9ac3e885f95ad14f53a5343673cbd932aca8603904638b3ef10afea6f81a5e55d47167b604836dc5e310a
+  metadata.gz: 2a8c17b521b0e391942bf99a2ecd41d18349b5c79b63e5e71bdd1365284d347c1c31c0315f9b62976ff0068c29248f1a009a4e6eac8e53198ce4e41a8173f8a7
+  data.tar.gz: af4a92361d63d56b269a61b088635801b158dd217c4f9bd3400b5b19a0f0e20bad314589a488be101e5204935a6ed68e7d48c771ab257e450cdb6d166edd1df5

data/lib/spectre/version.rb

@@ -1,3 +1,3 @@
 module Spectre
-  VERSION = '2.1.3'.freeze
+  VERSION = '2.1.4'.freeze
 end

data/lib/spectre.rb

@@ -775,6 +775,10 @@ module Spectre
     end
   end
 
+  ##
+  # The run context is passed to all specs and provides the
+  # DSL for assertions, expectations, logging, etc.
+  #
   class RunContext
     include Delegate
 
@@ -1158,7 +1162,7 @@ module Spectre
     # Skip the run for this spec. This can be used to skip spec runs when a certain
     # condition occurs.
     #
-    #   skip 'subject is not yet ready to be tests' unless service_is_ready()
+    #   skip 'subject is not yet ready to be tested' unless service_is_ready()
     #
     def skip message
       @skipped = true
@@ -1168,7 +1172,7 @@ module Spectre
   end
 
   class Specification
-    attr_reader :id, :name, :desc, :full_desc, :parent, :root, :tags, :data, :file
+    attr_reader :id, :name, :desc, :full_desc, :parent, :root, :tags, :data, :file, :block
 
     def initialize parent, name, desc, tags, data, file, block
       @parent = parent
@@ -1182,6 +1186,9 @@ module Spectre
       @full_desc = "#{@parent.full_desc} #{@desc}"
     end
 
+    ##
+    # Natural sort comparison for spec names respecting numeric parts.
+    #
     def <=>(other)
       # Split on dash: text part and numeric part
       self_parts = @name.split('-')
@@ -1196,10 +1203,9 @@ module Spectre
     end
 
     ##
-    # Creates a new +RunContext+ and executes the spec,
-    # +before+ and +after+ blocks
+    # Execute this specification with its before/after blocks
     #
-    def run engine, befores, afters, bag
+    def run(engine, befores, afters, bag)
       RunContext.new(engine, self, :spec, bag) do |run_context|
         engine.formatter.scope(@desc, self) do
           befores.each do |block|
@@ -1227,7 +1233,8 @@ module Spectre
   class DefinitionContext
     include Delegate
 
-    attr_reader :id, :name, :desc, :parent, :full_desc, :specs, :file
+    attr_reader :id, :name, :desc, :parent, :full_desc, :specs, :file,
+                :setups, :teardowns, :befores, :afters
 
     def initialize desc, file, engine, parent = nil
       @engine = engine
@@ -1257,6 +1264,93 @@ module Spectre
       @parent ? @parent.root : self
     end
 
+    ##
+    # Returns all direct child contexts
+    #
+    def children
+      @engine.contexts.select { |x| x.parent == self }
+    end
+
+    ##
+    # Execute this context with its specs, setups, and teardowns.
+    # Recursively executes child contexts using the tree structure.
+    #
+    def run(specs_set)
+      runs = []
+
+      # Find specs in this context that should be executed
+      selected = @specs.select { |x| specs_set.include? x }
+
+      # Check if any child contexts have specs to execute
+      has_child_specs = children.any? { |child| child.specs_in_tree?(specs_set) }
+
+      # Skip this context if it has no matching specs and no children with specs
+      return runs if selected.empty? && !has_child_specs
+
+      @engine.formatter.scope(@desc, self) do
+        # Execute setup, specs, and teardown for this context
+        if selected.any?
+          setup_bag = nil
+
+          if @setups.any?
+            setup_run = RunContext.new(@engine, self, :setup) do |run_context|
+              @setups.each do |block|
+                @engine.formatter.scope('setup', :setup) do
+                  @engine.logger.correlate do
+                    @engine.logger.debug("setup \"#{@desc}\"")
+                    run_context.execute(nil, &block)
+                  end
+                end
+              end
+            end
+
+            setup_bag = setup_run.bag
+            runs << setup_run
+          end
+
+          # Only run specs if setup was successful
+          if runs.all? { |x| x.status == :success }
+            runs += selected.map do |spec|
+              @engine.logger.correlate do
+                spec.run(@engine, @befores, @afters, setup_bag)
+              end
+            end
+          end
+
+          if @teardowns.any?
+            runs << RunContext.new(@engine, self, :teardown, setup_bag) do |run_context|
+              @teardowns.each do |block|
+                @engine.formatter.scope('teardown', :teardown) do
+                  @engine.logger.correlate do
+                    @engine.logger.debug("teardown \"#{@desc}\"")
+                    run_context.execute(nil, &block)
+                  end
+                end
+              end
+            end
+          end
+        end
+
+        # Recursively execute child contexts
+        children.each do |child_context|
+          @engine.logger.correlate do
+            runs += child_context.run(specs_set)
+          end
+        end
+      end
+
+      runs
+    end
+
+    ##
+    # Check recursively if this context or any of its children have specs in the filter set
+    #
+    def specs_in_tree?(specs_set)
+      return true if @specs.any? { |x| specs_set.include? x }
+
+      children.any? { |child| child.specs_in_tree?(specs_set) }
+    end
+
     ##
     # Creates a new sub context with the given block.
     #
@@ -1332,71 +1426,6 @@ module Spectre
         @specs << spec
       end
     end
-
-    # :nodoc:
-    def run specs
-      runs = []
-
-      selected = @specs.select { |x| specs.include? x }
-
-      return runs if selected.empty?
-
-      @engine.formatter.scope(@desc, self) do
-        if selected.any?
-          setup_bag = nil
-
-          if @setups.any?
-            setup_run = RunContext.new(@engine, self, :setup) do |run_context|
-              @setups.each do |block|
-                @engine.formatter.scope('setup', :setup) do
-                  @engine.logger.correlate do
-                    @engine.logger.debug("setup \"#{@desc}\"")
-                    run_context.execute(nil, &block)
-                  end
-                end
-              end
-            end
-
-            setup_bag = setup_run.bag
-
-            runs << setup_run
-          end
-
-          # Only run specs if setup was successful
-          if runs.all? { |x| x.status == :success }
-            runs += selected.map do |spec|
-              @engine.logger.correlate do
-                spec.run(@engine, @befores, @afters, setup_bag)
-              end
-            end
-          end
-
-          if @teardowns.any?
-            runs << RunContext.new(@engine, self, :teardown, setup_bag) do |run_context|
-              @teardowns.each do |block|
-                @engine.formatter.scope('teardown', :teardown) do
-                  @engine.logger.correlate do
-                    @engine.logger.debug("teardown \"#{@desc}\"")
-                    run_context.execute(nil, &block)
-                  end
-                end
-              end
-            end
-          end
-        end
-
-        @engine
-          .contexts
-          .select { |x| x.parent == self }
-          .each do |context|
-          @engine.logger.correlate do
-            runs += context.run(specs)
-          end
-        end
-      end
-
-      runs
-    end
   end
 
   ##
@@ -1636,11 +1665,12 @@ module Spectre
         end
       end
 
-      list
+      specs = list
+      specs_set = Set.new(list)
+
+      specs
         .group_by { |x| x.parent.root }
-        .flat_map do |context, specs|
-          context.run(specs)
-        end
+        .flat_map { |context, _| context.run(specs_set) }
     rescue Interrupt
       # Do nothing here
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spectre-core
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Christian Neubauer