lopata 0.1.20 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e55390905dd755e2f414e1164e0164ede72e4a11acd368ed6ff6971a7b69e34
-  data.tar.gz: d4aa229e3bba5a2ac1875546b7ffe75b684a89ed4e1e08e1769f501a81989ce1
+  metadata.gz: 594efeb814131537b5efdcd66d912bf4557038f47a85e3fad0fb9b17408586fb
+  data.tar.gz: a63860ec22996bd77f569ad3e85060b208eefc392ec79f6e5d3be7dc56ac7418
 SHA512:
-  metadata.gz: 7ea02b4920bc2534dc361aff03a6d277526f5aa53a51d15ba219e3ca6ee8877771b9fb185146172c67c9744afa18414baa6565e55ac5b213db00eb1fdf8884db
-  data.tar.gz: 6c546d9eed8857a1e852e00b64d6a99c65b744862d914bc51fe8bdd14b81b2f7abe80f2c23217d38b83748068731f7eabaacc5ae2eb4b29354845904772e1177
+  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

@@ -46,7 +46,7 @@ class Lopata::Scenario
   # @private
   def method_missing(method, *args, &block)
     if execution.let_methods.include?(method)
-      instance_exec(*args, &execution.let_methods[method])
+      execution.let_methods[method].call_in_scenario(self, *args)
     elsif metadata.keys.include?(method)
       metadata[method]
     else
@@ -129,15 +129,20 @@ class Lopata::Scenario
       end
     end
 
+    def let_base
+      if current_step && !current_step.groups.empty?
+        current_step.groups.last.let_methods
+      else
+        @let_methods
+      end
+    end
+
     def let(method_name, &block)
-      # define_singleton_method method_name, &block
-      base =
-        if current_step && !current_step.groups.empty?
-          current_step.groups.last.let_methods
-        else
-          @let_methods
-        end
-      base[method_name] = block
+      let_base[method_name] = LetMethod.new(&block)
+    end
+
+    def let!(method_name, &block)
+      let_base[method_name] = LetBangMethod.new(&block)
     end
 
     def cleanup
@@ -147,4 +152,42 @@ class Lopata::Scenario
       @scenario = nil
     end
   end
+
+  # @private
+  # let! methods incapsulate cached value and calculation block
+  class LetBangMethod
+    attr_reader :block, :calculated, :value
+
+    alias calculated? calculated
+
+    def initialize(&block)
+      @block = block
+      @calculated = false
+      @value = nil
+    end
+
+    def call_in_scenario(scenario, *args)
+      if calculated?
+        value
+      else
+        @value = scenario.instance_exec(&block)
+        @calculated = true
+        @value
+      end
+    end
+  end
+
+  # @private
+  # let methods calculates 
+  class LetMethod
+    attr_reader :block
+
+    def initialize(&block)
+      @block = block
+    end
+
+    def call_in_scenario(scenario, *args)
+      scenario.instance_exec(*args, &block)
+    end
+  end
 end

data/lib/lopata/scenario_builder.rb

@@ -277,6 +277,24 @@ class Lopata::ScenarioBuilder
     end
   end
 
+  # Define memorized runtime method for the scenario.
+  #  
+  # @note
+  #   The method to be called via #method_missing, so it wont override already defined methods.
+  #
+  # @example
+  #   let!(:started) { Time.now }
+  #   it 'started early' do
+  #     first_started = started
+  #     expect(started).to eq first_started
+  #   end
+  def let!(method_name, &block)
+    steps << Lopata::Step.new(:let) do
+      execution.let!(method_name, &block)
+    end
+  end
+
+
   # @!endgroup
 
   # @private

data/lib/lopata/step.rb

@@ -88,6 +88,10 @@ module Lopata
       @let_methods ||= {}
     end
 
+    def let_bang_methods 
+      @let_bang_methods ||= {}
+    end
+
     private
 
     # Group step's block is a block in context of builder, not scenario. So hide the @block to not be used in scenario.
@@ -116,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
@@ -166,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
@@ -187,5 +199,10 @@ module Lopata
     def let_methods
       (groups).compact.inject({}) { |merged, part| merged.merge(part.let_methods) }
     end
+
+    # Step bang methods is a combination of let_bang_methods for all contexts (group) the step included
+    def let_bang_methods
+      (groups).compact.inject({}) { |merged, part| merged.merge(part.let_bang_methods) }
+    end
   end
 end

data/lib/lopata/version.rb

@@ -1,6 +1,6 @@
 module Lopata
   # @private
   module Version
-    STRING = '0.1.20'
+    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.20
+  version: 0.1.22
 platform: ruby
 authors:
 - Alexey Volochnev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-14 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.20
+summary: lopata-0.1.22
 test_files: []