lopata 0.1.21 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c89f9dfc95a2a0586323e2fd682d971f619f8f47cba620c2846035af7a8d3736
-  data.tar.gz: ba2c2067b9cbce8691899cc5ba0a76c34295f54d1bb5bacea6234ac7b4756a46
+  metadata.gz: 9404c01f3020e012451ba5cd5c6d91fbec443df94fe961ad9159e296f5783775
+  data.tar.gz: 16523f8e209f6864370912267f5e26955e1cc07708cfc7f31b2d4f324c0a2aec
 SHA512:
-  metadata.gz: 0eada79585b1ca222a2ba29dacdecfb094cc32e50b21406e2e59e9326a8ad6f0463eff8f9772074d3f27bd2442a67efe233c3c08661ab3284b7b4cd71b069864
-  data.tar.gz: 1003113a61e1ec7093c7f6eab47e49ee87ab0ec7b267a593afe9c3b0625f095ce7ee024188837d7ec21e987e4437e7b26f42b8cdfc2370b6b813aacb9b2651b1
+  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/observers/console_output_observer.rb

@@ -1,4 +1,5 @@
 require_relative 'backtrace_formatter'
+require_relative 'group_tree'
 require 'forwardable'
 
 module Lopata
@@ -34,9 +35,20 @@ module Lopata
         statuses[scenario.status] += 1
 
         if scenario.failed?
-          scenario.steps.each do |step|
-            puts colored("  #{status_marker(step.status)} #{step.title}", step.status)
-            puts indent(4, backtrace_formatter.error_message(step.exception, include_backtrace: true)) if step.failed?
+          GroupTree.steps_hierarhy(scenario.steps).walk_through do |step|
+            if step.is_a?(Lopata::StepExecution)
+              next unless step.loggable?
+              puts colored("  #{status_marker(step.status)} #{step.title}", step.status)
+              puts indent(4, backtrace_formatter.error_message(step.exception, include_backtrace: true)) if step.failed?
+            else # GroupTree
+              group = step
+              if %i{ passed skipped }.include?(group.status)
+                puts colored("  #{status_marker(group.status)} #{group.title}", group.status)
+                false
+              else
+                true
+              end
+            end
           end
         end
 

data/lib/lopata/observers/group_tree.rb

@@ -0,0 +1,64 @@
+module Lopata
+  GroupTree = Struct.new(:group, :items, :title) do
+    def status
+      # return @status if @status
+      statuses = items.map(&:status).uniq
+      @status = 
+        if statuses.length == 1
+          statuses.first
+        elsif statuses.include?(:failed)
+          :failed
+        elsif 
+          statuses.first
+        end
+      @status
+    end
+
+    # Returns steps hierarhy: Group with nestet setps or groups
+    def self.steps_hierarhy(steps)
+      top = GroupTree.new(nil, [], '')
+      hierarhy = [top]
+      current_groups = []
+      steps.each do |step|
+        if step.groups == current_groups
+          hierarhy.last.items << step
+        else
+          # ensure hierarhy to is in current step tree - remove from hierary all groups not in new tree.
+          while hierarhy.last.group && !step.groups.include?(hierarhy.last.group)
+            hierarhy.pop
+          end
+          if hierarhy.last.group == step.groups.last
+            hierarhy.last.items << step
+          else
+            group_rest = step.groups.dup
+            while hierarhy.last.group && group_rest.first != hierarhy.last.group
+              group_rest.shift
+            end
+            group_rest.shift if group_rest.first == hierarhy.last.group
+            group_rest.each do
+              title = (hierarhy.map(&:group).compact + [_1]).map(&:title).join(': ')
+              group = GroupTree.new(_1, [], title)
+              hierarhy.last.items << group
+              hierarhy << group
+            end
+            hierarhy.last.items << step
+          end
+          current_groups = step.groups
+        end
+      end
+      return top
+    end
+
+    def walk_through(&block)
+      items.each do |step|
+        if step.is_a?(Lopata::StepExecution)
+          yield step
+        else # GroupTree
+          group = step
+          go_dipper = yield group
+          group.walk_through(&block) if go_dipper
+        end
+      end
+    end
+  end
+end

data/lib/lopata/observers/web_logger.rb

@@ -1,6 +1,7 @@
 require 'httparty'
 require 'json'
 require_relative 'backtrace_formatter'
+require_relative 'group_tree'
 
 module Lopata
   module Observers
@@ -48,7 +49,24 @@ module Lopata
 
     def add_attempt(scenario, finished)
       status = scenario.failed? ? Lopata::FAILED : Lopata::PASSED
-      steps = scenario.steps.map { |s| step_hash(s) }
+      steps = []
+      GroupTree.steps_hierarhy(scenario.steps).walk_through do |step|
+        if step.is_a?(Lopata::StepExecution)
+          next unless step.loggable?
+          steps << step_hash(step)
+        else # GroupTree
+
+          group = step
+          if %i{ passed skipped }.include?(group.status)
+            steps << group_hash(group)
+            false
+          else
+            true
+          end
+        end
+      end
+
+      steps = scenario.steps.select(&:loggable?).map { |s| step_hash(s) }
       request = { status: status, steps: steps, launch: { id: @launch_id, finished: finished } }
       test = test_id(scenario)
       post("/tests/#{test}/attempts.json", body: request)
@@ -67,6 +85,10 @@ module Lopata
       hash
     end
 
+    def group_hash(group)
+      { status: group.status, title: group.title }
+    end
+
     def test_id(scenario)
       request = {
         test: {

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)
@@ -145,7 +159,6 @@ class Lopata::Scenario
       let_base[method_name] = LetBangMethod.new(&block)
     end
 
-
     def cleanup
       @title = nil
       @metadata = nil

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,30 +104,48 @@ 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
-      group_title = groups.map { |g| "#{g.title}: " }.join
       "#{group_title}#{step.title}"
     end
 
+    def group_title
+      groups.map { |g| "#{g.title}: " }.join
+    end
+
     def run(scenario)
       @status = :running
       begin
+        unless check_dynamic_condition?(scenario)
+          @status = :ignored
+          return
+        end
         run_step(scenario)
         if pending?
           @status = :failed
@@ -145,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
@@ -157,6 +192,14 @@ module Lopata
       status == :skipped
     end
 
+    def ignored?
+      status == :ignored
+    end
+
+    def ignored!
+      status == :ignored
+    end
+
     def skip!
       @status = :skipped
     end
@@ -170,6 +213,12 @@ module Lopata
       @pending_message = message
     end
 
+    # Need log this step.
+    def loggable?
+      return false if ignored?
+      not %i{ let let! }.include?(method_name)
+    end
+
     def teardown?
       %i{ teardown cleanup }.include?(method_name)
     end
@@ -178,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.21'
+    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.21
+  version: 0.1.23
 platform: ruby
 authors:
 - Alexey Volochnev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-09 00:00:00.000000000 Z
+date: 2023-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -107,6 +107,7 @@ files:
 - lib/lopata/observers/backtrace_formatter.rb
 - lib/lopata/observers/base_observer.rb
 - lib/lopata/observers/console_output_observer.rb
+- lib/lopata/observers/group_tree.rb
 - lib/lopata/observers/web_logger.rb
 - lib/lopata/role.rb
 - lib/lopata/runner.rb
@@ -138,5 +139,5 @@ requirements: []
 rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
-summary: lopata-0.1.21
+summary: lopata-0.1.23
 test_files: []