lopata 0.1.35 → 0.1.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00deece4cfbd1afee78d43329179f904c3bd2c5e1036123883b0f5eb2b4e2699
-  data.tar.gz: e56c9e4d1d174d0c267cd29a1b8cb40f78d319b824a08caa245cb50657dcad58
+  metadata.gz: 26144921e2b69dc4a941e05583c6fab3fc5f0e85a9f19e3b0f76b4762c560c09
+  data.tar.gz: dcdb2f5e7507d897030f8977c1d58100ceeb53d7ac6dff8c6a9af7af8e5c23b2
 SHA512:
-  metadata.gz: 432da1597422542043252db0262fe66a5b4722c898331dd344f170bac76495fd5623cc0b6cae07eab9088993f0d42a7fbf7387b1907d069ea1a41627be1e70f0
-  data.tar.gz: befaa061e420494b632a6bd0db066f37e5349a7c5a55404925e7de8f317cd15253663c23d0972e81634cc5ad5d9008890e310db1f8cbbd563b3eb9eaa7076d68
+  metadata.gz: f54ef97186d06cf3486e053adc5118007f1926694441aa5741fae31f0de42947ce2cc340c0be1839ffdc12d5ecf7b7961f861f43a27067aad59fefc933be597c
+  data.tar.gz: 1e93d0d56949000c9bd621b6f033d3645bf3371540f7ed5b215c590641a1b86caf166b1f7679b89d6810d7c7307a78eb44075bd78a9427627300234c5f821f9a

data/lib/lopata/condition.rb

@@ -10,6 +10,13 @@ module Lopata
     alias positive? positive
     alias dynamic? dynamic
 
+    # Combine conditions: the result matches when all the given conditions match.
+    def self.combine(*conditions)
+      conditions = conditions.compact
+      return conditions.first if conditions.length <= 1
+      CombinedCondition.new(conditions)
+    end
+
     # Match scenario on build-time. 
     def match?(scenario)
       # dynamic steps match scenario in build-time: will be verified later
@@ -44,4 +51,27 @@ module Lopata
       positive? ? matched : !matched
     end
   end
-end
+
+  # @private
+  # All the conditions must match.
+  class CombinedCondition
+    attr_reader :conditions, :dynamic
+
+    def initialize(conditions)
+      @conditions = conditions
+      @dynamic = conditions.any?(&:dynamic?)
+    end
+
+    alias dynamic? dynamic
+
+    def match?(scenario)
+      conditions.all? { |c| c.match?(scenario) }
+    end
+
+    def match_dynamic?(scenario_runtime)
+      return false unless dynamic?
+      # Static conditions are verified on build-time, so check dynamic ones only.
+      conditions.select(&:dynamic?).all? { |c| c.match_dynamic?(scenario_runtime) }
+    end
+  end
+end

data/lib/lopata/scenario.rb

@@ -63,7 +63,7 @@ class Lopata::Scenario
   # @private
   # Scenario execution and live-cycle information
   class Execution
-    attr_reader :scenario, :current_step, :top, :title, :base_metadata
+    attr_reader :scenario, :current_step, :top, :title, :base_metadata, :started_at
 
     def initialize(title, metadata = {})
       @title = title
@@ -87,6 +87,7 @@ class Lopata::Scenario
         setup
         top.reset_status
       end
+      @started_at = Time.now
       world.notify_observers(:scenario_started, self)
       run_step(top)
       world.notify_observers(:scenario_finished, self)

data/lib/lopata/step.rb

@@ -40,7 +40,10 @@ 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, parent: parent)
+            shared_executions = shared_step.execution_steps(scenario, parent: parent)
+            # Static conditions are already applied on build-time, dynamic ones must be checked on runtime.
+            shared_executions.each { |e| e.add_condition(condition) } if condition&.dynamic?
+            steps += shared_executions
           end
         elsif step.is_a?(Proc)
           steps << StepExecution.new(self, parent, condition: condition, &step)
@@ -173,7 +176,12 @@ module Lopata
     end
 
     def ignored!
-      status == :ignored
+      @status = :ignored
+    end
+
+    # Add condition to be matched in addition to own step condition.
+    def add_condition(other)
+      @condition = Lopata::Condition.combine(other, @condition)
     end
 
     def skip!

data/lib/lopata/version.rb

@@ -1,6 +1,6 @@
 module Lopata
   # @private
   module Version
-    STRING = '0.1.35'
+    STRING = '0.1.37'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lopata
 version: !ruby/object:Gem::Version
-  version: 0.1.35
+  version: 0.1.37
 platform: ruby
 authors:
 - Alexey Volochnev
@@ -135,5 +135,5 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 3.6.8
 specification_version: 4
-summary: lopata-0.1.35
+summary: lopata-0.1.37
 test_files: []