lopata 0.1.21 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c89f9dfc95a2a0586323e2fd682d971f619f8f47cba620c2846035af7a8d3736
-  data.tar.gz: ba2c2067b9cbce8691899cc5ba0a76c34295f54d1bb5bacea6234ac7b4756a46
+  metadata.gz: 594efeb814131537b5efdcd66d912bf4557038f47a85e3fad0fb9b17408586fb
+  data.tar.gz: a63860ec22996bd77f569ad3e85060b208eefc392ec79f6e5d3be7dc56ac7418
 SHA512:
-  metadata.gz: 0eada79585b1ca222a2ba29dacdecfb094cc32e50b21406e2e59e9326a8ad6f0463eff8f9772074d3f27bd2442a67efe233c3c08661ab3284b7b4cd71b069864
-  data.tar.gz: 1003113a61e1ec7093c7f6eab47e49ee87ab0ec7b267a593afe9c3b0625f095ce7ee024188837d7ec21e987e4437e7b26f42b8cdfc2370b6b813aacb9b2651b1
+  metadata.gz: 110b59071e44955f890c8df68c6cc1d5180b968d8c93556ddae4a3da29fe253951f9650a36dc7f5dc38ad04e9bbd9e770100332597512c267ae387cfca7b82f0
+  data.tar.gz: f2300be4be7155921fdf1972fd5bc98832daccc3707d80c8f93d51fe806a130914349f978931c09317f629acc57561b564955a07521a66139234229e6b9a7bdc

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

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

data/lib/lopata/step.rb

@@ -120,10 +120,13 @@ module Lopata
     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
@@ -170,6 +173,11 @@ module Lopata
       @pending_message = message
     end
 
+    # Need log this step.
+    def loggable?
+      not %i{ let let! }.include?(method_name)
+    end
+
     def teardown?
       %i{ teardown cleanup }.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.22'
   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.22
 platform: ruby
 authors:
 - Alexey Volochnev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-09 00:00:00.000000000 Z
+date: 2023-08-18 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.22
 test_files: []