hiptest-publisher 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7060a45b500229208b1aab41f027f613a16cfaeb
-  data.tar.gz: 5e2e1810d7b3d7ced4b7f60fb4396b9fd9e636aa
+  metadata.gz: b6d19d39df5ed77a98c6c2030280dfa7937241ae
+  data.tar.gz: 69d4a19484003825943dd8f2dee47b45331f4b6d
 SHA512:
-  metadata.gz: f5070ded6342524ea605b5cb9a44344fecbfb09efb34a943929775638dd782e76764b2eec229779c1d48bef7e0a9fa9aa2cffa35bd8ca4bd6bcd0f152820532c
-  data.tar.gz: 47c9e6af92a1d2838477959a629a3742abe86a6e50cc3a08ee74749d5f54daa6afcc99e33cb1dd866608621e76e3d9c0d610565fd1790f3af12e37451bc19d1b
+  metadata.gz: cf59dddeda807a69e100601c578125ffe5066f05fa7dc47d6fda475d9162f445defd5fdaa71c312e19c3ef381c75c38055b8da597ed4b0073018326a8705e78a
+  data.tar.gz: 9b7650ce40ee03605aece39b984783f79dae990bd85bcba65b2a49a6e6e9c25708e35c60427560fb75e65451b0a9f1594bcf61980a7dca9dbce1bbe94fe4587e

data/README.md

@@ -210,4 +210,4 @@ See the [CONTRIBUTING](https://github.com/hiptest/hiptest-publisher/blob/master/
 Contributors
 ------------
 
-The @hiptest team, @mhfrantz, @tikolakin, @atulhm, @etorreborre, @daniel-kun, @weeksghost
+The @hiptest team, @mhfrantz, @tikolakin, @atulhm, @etorreborre, @daniel-kun, @weeksghost, @lostiniceland

data/lib/config/groovy-spock.conf

@@ -4,6 +4,7 @@ indentation = '  '
 dirname_convention = 'underscore'
 filename_convention = 'camelize'
 naming_convention = 'camelize_lower'
+custom_renderer = 'groovy/spock/renderer'
 
 [tests]
 filename = 'ProjectSpec.groovy'

data/lib/hiptest-publisher.rb

@@ -145,7 +145,7 @@ module Hiptest
 
     def write_node_to_file(path, node, context, message, ask_overwrite: false)
       write_to_file(path, message, ask_overwrite: ask_overwrite) do
-        Hiptest::Renderer.render(node, context)
+        context.get_renderer.render(node, context)
       end
     end
 

data/lib/hiptest-publisher/base_renderer.rb

@@ -0,0 +1,110 @@
+require 'ruby-handlebars'
+
+require 'hiptest-publisher/gherkin_adder'
+require 'hiptest-publisher/nodes_walker'
+require 'hiptest-publisher/handlebars_helper'
+require 'hiptest-publisher/render_context_maker'
+
+module Hiptest
+  class BaseRenderer < Hiptest::Nodes::Walker
+    attr_reader :rendered
+    include RenderContextMaker
+
+    def self.render(node, context)
+      renderer = self.new(context)
+      renderer.walk_node(node)
+      renderer.rendered[node]
+    end
+
+    def initialize(context)
+      @rendered = {}
+      @context = context
+      @template_finder = context.template_finder
+    end
+
+    def walk_call(call)
+      # For Gherkin, we need the special arguments rendered.
+      if call.free_text_arg
+        @rendered_children[:free_text_arg] = @rendered[call.free_text_arg.children[:value]]
+      end
+
+      if call.datatable_arg
+        @rendered_children[:datatable_arg] = @rendered[call.datatable_arg.children[:value]]
+      end
+
+      super(call)
+    end
+
+    def walk_scenarios(scs)
+      walk_scenario_container(scs)
+      super(scs)
+    end
+
+    def walk_actionword(aw)
+      add_splitted_tags(aw)
+      super(aw)
+    end
+
+    def walk_folder(folder)
+      ancestor_tags = folder.ancestors.map {|f| f.children[:tags]}.flatten.uniq
+      @rendered_children[:ancestor_tags] = ancestor_tags.map {|t| Hiptest::Renderer.render(t, @context)}
+
+      walk_scenario_container(folder)
+      super(folder)
+    end
+
+    def call_node_walker(node)
+      if node.is_a? Hiptest::Nodes::Node
+        @rendered_children = {}
+
+        node.children.each {|name, child| @rendered_children[name] = @rendered[child]}
+        @rendered[node] = render_node(node, super(node))
+      elsif node.is_a? Array
+        @rendered[node] = node.map {|item| @rendered[item]}
+      else
+        @rendered[node] = node
+      end
+    end
+
+    def render_node(node, render_context)
+      render_context ||= {}
+      render_context[:node] = node
+      render_context[:rendered_children] = @rendered_children
+      render_context[:context] = @context
+
+      @template_finder.get_compiled_handlebars(node.kind).call(render_context)
+    end
+
+    private
+
+    def add_splitted_tags(context)
+      @rendered_children[:splitted_tags] = context.children[:tags].map do |tag|
+        @rendered[tag]
+      end
+    end
+
+    def walk_scenario_container(container)
+     # For Robot framework, we need direct access to every scenario
+     # datatables and body rendered.
+
+      @rendered_children[:splitted_scenarios] = container.children[:scenarios].map {|sc|
+        {
+          name: @rendered[sc.children[:name]],
+          tags: sc.children[:tags].map {|tag| @rendered[tag]},
+          uid: @rendered[sc.children[:uid]],
+          datatable: @rendered[sc.children[:datatable]],
+          datasets: sc.children[:datatable].children[:datasets].map {|dataset|
+            {
+              scenario_name: @rendered[sc.children[:name]],
+              name: @rendered[dataset.children[:name]],
+              uid: @rendered[dataset.children[:uid]],
+              arguments: @rendered[dataset.children[:arguments]]
+            }
+          },
+          parameters:  @rendered[sc.children[:parameters]],
+          body: @rendered[sc.children[:body]]
+        }
+      }
+    end
+  end
+end

data/lib/hiptest-publisher/language_specifics/groovy/spock/renderer.rb

@@ -0,0 +1,28 @@
+require 'hiptest-publisher/nodes'
+require 'hiptest-publisher/base_renderer'
+
+module Hiptest
+  class Renderer < Hiptest::BaseRenderer
+
+    def walk_call(call)
+      base = super(call)
+      base[:use_expect_annotation] = needs_fixing?(call)
+      base[:use_main_annotation?] = !(call.children[:annotation].nil? || ['and', 'but'].include?(call.children[:annotation]))
+
+      return base
+    end
+
+    private
+
+    def needs_fixing?(call)
+      scenario = call.parent
+
+      return false unless scenario.is_a?(Hiptest::Nodes::Scenario)
+      return false unless call.children[:annotation].nil? || call.children[:annotation].downcase == 'then'
+
+      return call.parent.children[:body].select do |step|
+        step.is_a?(Hiptest::Nodes::Call) && !step.children[:annotation].nil? && step.children[:annotation].downcase == 'when'
+      end.empty?
+    end
+  end
+end

data/lib/hiptest-publisher/nodes.rb

@@ -2,7 +2,6 @@ require 'set'
 
 require 'hiptest-publisher/string'
 require 'hiptest-publisher/utils'
-require 'hiptest-publisher/renderer'
 
 module Hiptest
   module Nodes
@@ -15,7 +14,7 @@ module Hiptest
       end
 
       def render(rendering_context)
-        return Hiptest::Renderer.render(self, rendering_context)
+        return rendering_context.get_renderer.render(self, rendering_context)
       end
 
       def each_sub_nodes(*types, deep: false)

data/lib/hiptest-publisher/options_parser.rb

@@ -308,7 +308,6 @@ end
 
 
 class NodeRenderingContext
-
   def initialize(properties)
     # should contain  :node, :path, :description, :indentation
     @properties = OpenStruct.new(properties)
@@ -341,6 +340,16 @@ class NodeRenderingContext
   def relative_folder
     File.dirname(@properties.relative_path)
   end
+
+  def get_renderer
+    if @properties.renderer_path.nil?
+      require 'hiptest-publisher/renderer'
+    else
+      require "hiptest-publisher/language_specifics/#{@properties.renderer_path}"
+    end
+
+    Hiptest::Renderer
+  end
 end
 
 
@@ -549,7 +558,8 @@ class LanguageGroupConfig
       call_prefix: @language_group_params[:call_prefix],
       package: @language_group_params[:package],
       namespace: @language_group_params[:namespace],
-      uids: @user_params[:uids]
+      uids: @user_params[:uids],
+      renderer_path: @language_group_params[:custom_renderer]
     )
   end
 

data/lib/hiptest-publisher/render_context_maker.rb

@@ -88,7 +88,6 @@ module Hiptest
       {
         :has_arguments? => !c.children[:arguments].empty?,
         :has_annotation? => !c.children[:annotation].nil?,
-        :use_main_annotation? => !(c.children[:annotation].nil? || ['and', 'but'].include?(c.children[:annotation])),
         :in_actionword? => c.parent.is_a?(Hiptest::Nodes::Actionword),
         :in_datatabled_scenario? => c.parent.is_a?(Hiptest::Nodes::Scenario) && has_datasets?(c.parent),
         :chunks => c.chunks || [],

data/lib/hiptest-publisher/renderer.rb

@@ -1,110 +1,6 @@
-require 'ruby-handlebars'
-
-require 'hiptest-publisher/gherkin_adder'
-require 'hiptest-publisher/nodes_walker'
-require 'hiptest-publisher/handlebars_helper'
-require 'hiptest-publisher/render_context_maker'
+require 'hiptest-publisher/base_renderer'
 
 module Hiptest
-  class Renderer < Hiptest::Nodes::Walker
-    attr_reader :rendered
-    include RenderContextMaker
-
-    def self.render(node, context)
-      renderer = Hiptest::Renderer.new(context)
-      renderer.walk_node(node)
-      renderer.rendered[node]
-    end
-
-    def initialize(context)
-      @rendered = {}
-      @context = context
-      @template_finder = context.template_finder
-    end
-
-    def walk_call(call)
-      # For Gherkin, we need the special arguments rendered.
-      if call.free_text_arg
-        @rendered_children[:free_text_arg] = @rendered[call.free_text_arg.children[:value]]
-      end
-
-      if call.datatable_arg
-        @rendered_children[:datatable_arg] = @rendered[call.datatable_arg.children[:value]]
-      end
-
-      super(call)
-    end
-
-    def walk_scenarios(scs)
-      walk_scenario_container(scs)
-      super(scs)
-    end
-
-    def walk_actionword(aw)
-      add_splitted_tags(aw)
-      super(aw)
-    end
-
-    def walk_folder(folder)
-      ancestor_tags = folder.ancestors.map {|f| f.children[:tags]}.flatten.uniq
-      @rendered_children[:ancestor_tags] = ancestor_tags.map {|t| Hiptest::Renderer.render(t, @context)}
-
-      walk_scenario_container(folder)
-      super(folder)
-    end
-
-    def call_node_walker(node)
-      if node.is_a? Hiptest::Nodes::Node
-        @rendered_children = {}
-
-        node.children.each {|name, child| @rendered_children[name] = @rendered[child]}
-        @rendered[node] = render_node(node, super(node))
-      elsif node.is_a? Array
-        @rendered[node] = node.map {|item| @rendered[item]}
-      else
-        @rendered[node] = node
-      end
-    end
-
-    def render_node(node, render_context)
-      render_context ||= {}
-      render_context[:node] = node
-      render_context[:rendered_children] = @rendered_children
-      render_context[:context] = @context
-
-      @template_finder.get_compiled_handlebars(node.kind).call(render_context)
-    end
-
-    private
-
-    def add_splitted_tags(context)
-      @rendered_children[:splitted_tags] = context.children[:tags].map do |tag|
-        @rendered[tag]
-      end
-    end
-
-    def walk_scenario_container(container)
-     # For Robot framework, we need direct access to every scenario
-     # datatables and body rendered.
-
-      @rendered_children[:splitted_scenarios] = container.children[:scenarios].map {|sc|
-        {
-          name: @rendered[sc.children[:name]],
-          tags: sc.children[:tags].map {|tag| @rendered[tag]},
-          uid: @rendered[sc.children[:uid]],
-          datatable: @rendered[sc.children[:datatable]],
-          datasets: sc.children[:datatable].children[:datasets].map {|dataset|
-            {
-              scenario_name: @rendered[sc.children[:name]],
-              name: @rendered[dataset.children[:name]],
-              uid: @rendered[dataset.children[:uid]],
-              arguments: @rendered[dataset.children[:arguments]]
-            }
-          },
-          parameters:  @rendered[sc.children[:parameters]],
-          body: @rendered[sc.children[:body]]
-        }
-      }
-    end
+  class Renderer < Hiptest::BaseRenderer
   end
 end

data/lib/templates/groovy/call.hbs

@@ -1,2 +1,2 @@
-{{#unless in_actionword?}}{{#if use_main_annotation?}}{{rendered_children.annotation}}:
+{{#unless in_actionword?}}{{#if use_main_annotation?}}{{#if use_expect_annotation}}expect{{else}}{{rendered_children.annotation}}{{/if}}:
 {{/if}}{{/unless}}{{#if context.call_prefix}}{{{context.call_prefix}}}.{{/if}}{{{ camelize_lower rendered_children.actionword }}}({{{ join rendered_children.all_arguments ', '}}})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiptest-publisher
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Hiptest R&D
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-08 00:00:00.000000000 Z
+date: 2017-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -248,6 +248,7 @@ files:
 - lib/config/specflow.conf
 - lib/hiptest-publisher.rb
 - lib/hiptest-publisher/actionword_indexer.rb
+- lib/hiptest-publisher/base_renderer.rb
 - lib/hiptest-publisher/call_arguments_adder.rb
 - lib/hiptest-publisher/cli_options_checker.rb
 - lib/hiptest-publisher/client.rb
@@ -257,6 +258,7 @@ files:
 - lib/hiptest-publisher/gherkin_adder.rb
 - lib/hiptest-publisher/handlebars_helper.rb
 - lib/hiptest-publisher/items_orderer.rb
+- lib/hiptest-publisher/language_specifics/groovy/spock/renderer.rb
 - lib/hiptest-publisher/nodes.rb
 - lib/hiptest-publisher/nodes_walker.rb
 - lib/hiptest-publisher/options_parser.rb