lopata 0.1.22 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 594efeb814131537b5efdcd66d912bf4557038f47a85e3fad0fb9b17408586fb
-  data.tar.gz: a63860ec22996bd77f569ad3e85060b208eefc392ec79f6e5d3be7dc56ac7418
+  metadata.gz: 9404c01f3020e012451ba5cd5c6d91fbec443df94fe961ad9159e296f5783775
+  data.tar.gz: 16523f8e209f6864370912267f5e26955e1cc07708cfc7f31b2d4f324c0a2aec
 SHA512:
-  metadata.gz: 110b59071e44955f890c8df68c6cc1d5180b968d8c93556ddae4a3da29fe253951f9650a36dc7f5dc38ad04e9bbd9e770100332597512c267ae387cfca7b82f0
-  data.tar.gz: f2300be4be7155921fdf1972fd5bc98832daccc3707d80c8f93d51fe806a130914349f978931c09317f629acc57561b564955a07521a66139234229e6b9a7bdc
+  metadata.gz: 2c81b2e83e0df4838d7743dccdc6c79ef689ccb0d8a1caed6bf3ba3ecfd228041841b531881390a5efe369cc05d681feab919b0d0acebea8d48a065c36e0c6be
+  data.tar.gz: 363b3ea67a91e50ead1d51eb23c50856e9a5a8f2a0f524f56fbabd9f72d3c1b5cb4b7254b9bcf6bcc4fbaef57024ffe6a207bb52d277f8eb96e1a3723d1346fc

data/lib/lopata/condition.rb

@@ -1,14 +1,19 @@
 module Lopata
   # @private
   class Condition
-    attr_reader :condition, :positive
+    attr_reader :condition, :positive, :dynamic
     def initialize(condition, positive: true)
       @condition, @positive = condition, positive
+      @dynamic = @condition.is_a?(Proc)
     end
 
     alias positive? positive
+    alias dynamic? dynamic
 
+    # Match scenario on build-time. 
     def match?(scenario)
+      # dynamic steps match scenario in build-time: will be verified later
+      return true if dynamic?  
       matched = match_metadata?(scenario)
       positive? ? matched : !matched
     end
@@ -33,5 +38,10 @@ module Lopata
       end
     end
 
+    def match_dynamic?(scenario_runtime)
+      return false unless dynamic?
+      matched = scenario_runtime.instance_exec(&condition)
+      positive? ? matched : !matched
+    end
   end
 end

data/lib/lopata/scenario.rb

@@ -90,7 +90,17 @@ class Lopata::Scenario
     end
 
     def run_step(step)
-      return if step.skipped?
+      return if step.skipped? || step.ignored?
+      groups = step.groups 
+      if groups.length > 0 && groups != @current_groups
+        @current_groups = groups
+        condition = groups.last.condition
+        if condition&.dynamic? && !condition.match_dynamic?(scenario)
+          step.ignored!
+          ignore_groups(groups)
+          return
+        end
+      end
       @current_step = step
       step.run(scenario)
       skip_rest if step.failed? && step.skip_rest_on_failure?
@@ -113,6 +123,10 @@ class Lopata::Scenario
       steps.select { |s| s.status == :not_runned && !s.teardown? }.each(&:skip!)
     end
 
+    def ignore_groups(groups)
+      steps.select { _1.status == :not_runned && _1.groups.take(groups.length) == groups }.each(&:ignored!)
+    end
+
     def metadata
       if current_step
         @metadata.merge(current_step.metadata)

data/lib/lopata/step.rb

@@ -25,7 +25,7 @@ module Lopata
     def execution_steps(scenario, groups: [])
       return [] if condition && !condition.match?(scenario)
       return [] unless block
-      [StepExecution.new(self, groups, &block)]
+      [StepExecution.new(self, groups, condition: condition, &block)]
     end
   end
 
@@ -39,13 +39,14 @@ module Lopata
         if step.is_a?(String)
           Lopata::SharedStep.find(step).steps.each do |shared_step|
             next if shared_step.condition && !shared_step.condition.match?(scenario)
-            steps += shared_step.execution_steps(scenario, groups: groups)
+            shared_group = SharedGroupStep.new(:shared_step)
+            steps += shared_step.execution_steps(scenario, groups: groups + [shared_group])
           end
         elsif step.is_a?(Proc)
-          steps << StepExecution.new(self, groups, &step)
+          steps << StepExecution.new(self, groups, condition: condition, &step)
         end
       end
-      steps << StepExecution.new(self, groups, &block) if block
+      steps << StepExecution.new(self, groups, condition: condition, &block) if block
       steps.reject { |s| !s.block }
     end
 
@@ -103,20 +104,31 @@ module Lopata
     end
   end
 
+  # @private
+  # Fake group for shared step instance
+  # Used to build group hierarhy including chared steps
+  class SharedGroupStep < Step
+    # stub title - should not be used in scenario/step name generation.
+    def title 
+      ''
+    end
+  end
+
   #@private
   class StepExecution
-    attr_reader :step, :status, :exception, :block, :pending_message, :groups
+    attr_reader :step, :status, :exception, :block, :pending_message, :groups, :condition
     extend Forwardable
     def_delegators :step, :method_name
 
     class PendingStepFixedError < StandardError; end
 
-    def initialize(step, groups, &block)
+    def initialize(step, groups, condition: nil, &block)
       @step = step
       @status = :not_runned
       @exception = nil
       @block = block
       @groups = groups
+      @condition = condition
     end
 
     def title
@@ -130,6 +142,10 @@ module Lopata
     def run(scenario)
       @status = :running
       begin
+        unless check_dynamic_condition?(scenario)
+          @status = :ignored
+          return
+        end
         run_step(scenario)
         if pending?
           @status = :failed
@@ -148,6 +164,22 @@ module Lopata
       scenario.instance_exec(&block)
     end
 
+    def check_dynamic_condition?(scenario)
+      dynamic_conditions.each do
+        return false unless _1.match_dynamic?(scenario)
+      end
+      true
+    end
+
+    def dynamic_conditions
+      conds = []
+      conds << condition if condition&.dynamic?
+      groups.each do
+        conds << _1.condition if _1.condition&.dynamic?
+      end
+      conds
+    end
+
     def failed?
       status == :failed
     end
@@ -160,6 +192,14 @@ module Lopata
       status == :skipped
     end
 
+    def ignored?
+      status == :ignored
+    end
+
+    def ignored!
+      status == :ignored
+    end
+
     def skip!
       @status = :skipped
     end
@@ -175,6 +215,7 @@ module Lopata
 
     # Need log this step.
     def loggable?
+      return false if ignored?
       not %i{ let let! }.include?(method_name)
     end
 
@@ -186,6 +227,10 @@ module Lopata
       teardown? && self.groups.last == group
     end
 
+    def in_group?(group)
+      groups.include?(group)
+    end
+
     def skip_rest_on_failure?
       %i{ setup action }.include?(method_name)
     end

data/lib/lopata/version.rb

@@ -1,6 +1,6 @@
 module Lopata
   # @private
   module Version
-    STRING = '0.1.22'
+    STRING = '0.1.23'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lopata
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.23
 platform: ruby
 authors:
 - Alexey Volochnev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-18 00:00:00.000000000 Z
+date: 2023-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -139,5 +139,5 @@ requirements: []
 rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
-summary: lopata-0.1.22
+summary: lopata-0.1.23
 test_files: []