hiptest-publisher 1.22.0 → 1.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6cdf69058942b8d31c0cf0bb28be35c1fe96f22c
-  data.tar.gz: 78a1e2f929a5de1053f56274c6555984c0136db0
+SHA256:
+  metadata.gz: dd655143571daad59fa1d3e46c7d7d486d0f7082a27a79672c7432cf3dafe2f9
+  data.tar.gz: 6dca3a65541bb3dbb8be9aedb57ec357b9e5d4f92a710268b8fb95a9ce270dc7
 SHA512:
-  metadata.gz: '079b4604dc8f521a72a4985837cd9cd280783337c8a68ff6c2450ed0d315625fc7d898dfc3b6873fd5ec463a2db4991987eb82a86f43e93d2e1e828cdd178905'
-  data.tar.gz: 695075f59e61603b8972a0c40499f7ed42f04c48edbce740f46edfb534a05f3431c5ef0c1f9a93d83782943e0e8f327fe9bba9b6a7b6372b7430379a70fc2d82
+  metadata.gz: a2f7b9d87e0a8cf5e62fd08004d07cbf58422cdc1406f676709a32ebf344af3d57f91caad5a8503c918a9bb21a61931189134b08fc00fc1ccc39592712a704c7
+  data.tar.gz: ba8ce3d545f8f6c6e1f8d2ceb7205f0e63f54063c2696d66e2a7f55bfbfa6407191206c30b1d47d65bf2ec43e5f2ae911df32462fb797243b3f4a465ad47e284

data/lib/hiptest-publisher/indexers/actionword_indexer.rb

@@ -3,7 +3,6 @@ module Hiptest
     def initialize(project)
       @project = project
       @indexed = {}
-      @uid_indexed = {}
       index_actionwords
     end
 
@@ -23,16 +22,11 @@ module Hiptest
         }
 
         @indexed[aw_name] = data
-        @uid_indexed[aw.children[:uid]] = data
       end
     end
 
     def get_index(name)
       @indexed[name]
     end
-
-    def get_uid_index(uid)
-      @uid_indexed[uid]
-    end
   end
 end

data/lib/hiptest-publisher/indexers/library_actionword_indexer.rb

@@ -0,0 +1,32 @@
+module Hiptest
+  class LibraryActionwordIndexer
+    def initialize(project)
+      @project = project
+      @indexed = {}
+      index_library_actionwords
+    end
+
+    def index_library_actionwords
+      @project.each_sub_nodes(Hiptest::Nodes::LibraryActionword) do |aw|
+        aw_name = aw.children[:name]
+        indexed_parameters = {}
+
+        aw.children[:parameters].map do |param|
+          param_name = param.children[:name]
+          indexed_parameters[param_name] = param.children[:default]
+        end
+
+        data = {
+          actionword: aw,
+          parameters: indexed_parameters
+        }
+
+        @indexed[aw_name] = data
+      end
+    end
+
+    def get_index(name)
+      @indexed[name]
+    end
+  end
+end

data/lib/hiptest-publisher/node_modifiers/actionword_uniq_renamer.rb

@@ -11,10 +11,10 @@ module Hiptest
 
       def make_uniq_names
         @project.children[:libraries].children[:libraries].each do |library|
-          library.children[:actionwords].each do |actionword|
-            existing_names = library.children[:actionwords].reject{|aw| aw == actionword}.map(&:uniq_name)
-            new_name = find_uniq_name(actionword.children[:name], existing_names)
-            actionword.uniq_name = new_name
+          library.children[:library_actionwords].each do |library_actionword|
+            existing_names = library.children[:library_actionwords].reject{|aw| aw == library_actionword}.map(&:uniq_name)
+            new_name = find_uniq_name(library_actionword.children[:name], existing_names)
+            library_actionword.uniq_name = new_name
           end
         end
       end

data/lib/hiptest-publisher/node_modifiers/add_all.rb

@@ -5,14 +5,12 @@ require 'hiptest-publisher/node_modifiers/gherkin_adder'
 require 'hiptest-publisher/node_modifiers/items_orderer'
 require 'hiptest-publisher/node_modifiers/parameter_type_adder'
 require 'hiptest-publisher/node_modifiers/parent_adder'
-require 'hiptest-publisher/node_modifiers/uid_call_reference_adder'
 
 module Hiptest
   module NodeModifiers
     def self.add_all(project, sort_method = nil)
       DatatableFixer.add(project)
       ParentAdder.add(project)
-      UidCallReferencerAdder.add(project)
       ParameterTypeAdder.add(project)
       DefaultArgumentAdder.add(project)
       ActionwordUniqRenamer.add(project)

data/lib/hiptest-publisher/node_modifiers/call_arguments_adder.rb

@@ -1,32 +1,26 @@
 require 'hiptest-publisher/indexers/actionword_indexer'
+require 'hiptest-publisher/indexers/library_actionword_indexer'
 require 'hiptest-publisher/nodes'
 
 module Hiptest
   module NodeModifiers
     class DefaultArgumentAdder
       def self.add(project)
-        self.new(project).update_all_calls
+        self.new(project).update_calls
       end
 
       def initialize(project)
         @project = project
+        @library_indexer = LibraryActionwordIndexer.new(project)
         @indexer = ActionwordIndexer.new(project)
       end
 
-      def update_all_calls
-        update_calls
-        update_uid_calls
-      end
-
       def update_calls
         @project.each_sub_nodes(Hiptest::Nodes::Call) do |call|
-          update_call(call, @indexer.get_index(call.children[:actionword]))
-        end
-      end
+          actionword = @library_indexer.get_index(call.children[:actionword])
+          actionword = @indexer.get_index(call.children[:actionword]) if actionword.nil?
 
-      def update_uid_calls
-        @project.each_sub_nodes(Hiptest::Nodes::UIDCall) do |uid_call|
-          update_call(uid_call, @indexer.get_uid_index(uid_call.children[:uid]))
+          update_call(call, actionword)
         end
       end
 

data/lib/hiptest-publisher/node_modifiers/gherkin_adder.rb

@@ -1,4 +1,5 @@
 require 'hiptest-publisher/indexers/actionword_indexer'
+require 'hiptest-publisher/indexers/library_actionword_indexer'
 require 'hiptest-publisher/nodes'
 
 module Hiptest
@@ -11,6 +12,7 @@ module Hiptest
       def initialize(project)
         @project = project
         @indexer = ActionwordIndexer.new(project)
+        @library_indexer = LibraryActionwordIndexer.new(project)
         @annotations_counter = AnnotationsCounter.new
 
         @special_params = ['__free_text', '__datatable']
@@ -19,11 +21,14 @@ module Hiptest
       def update_calls
         @project.each_sub_nodes(Hiptest::Nodes::Scenario, Hiptest::Nodes::Actionword, Hiptest::Nodes::Test, Hiptest::Nodes::Folder) do |item|
           @last_annotation = nil
-          item.each_sub_nodes(Hiptest::Nodes::Call, Hiptest::Nodes::UIDCall) do |call|
+          item.each_sub_nodes(Hiptest::Nodes::Call) do |call|
             set_call_chunks(call)
             call.children[:gherkin_text] ||= "#{text_annotation(call)} #{prettified(call)}"
 
             if actionword = get_actionword(call)
+              if actionword.is_a?(Hiptest::Nodes::LibraryActionword)
+                call.children[:library_name] = actionword.parent.children[:name]
+              end
               @annotations_counter.increment(actionword, code_annotation(call))
               set_actionwords_chunks(actionword)
 
@@ -187,8 +192,11 @@ module Hiptest
       end
 
       def get_actionword(call)
+        actionword = @library_indexer.get_index(call.children[:actionword])
 
-        actionword = call.is_a?(Hiptest::Nodes::UIDCall) ? @indexer.get_uid_index(call.children[:uid]) : @indexer.get_index(call.children[:actionword])
+        if actionword.nil?
+          actionword = @indexer.get_index(call.children[:actionword])
+        end
 
         actionword && actionword[:actionword] || nil
       end

data/lib/hiptest-publisher/node_modifiers/parameter_type_adder.rb

@@ -49,8 +49,8 @@ module Hiptest
       end
 
       def gather_call_argument_types(node)
-        node.each_sub_nodes(Hiptest::Nodes::Call, Hiptest::Nodes::UIDCall) do |call|
-          actionword_name = call.is_a?(Hiptest::Nodes::Call) ? call.children[:actionword] : call.children[:actionword_name]
+        node.each_sub_nodes(Hiptest::Nodes::Call) do |call|
+          actionword_name = call.children[:actionword]
 
           @call_types.add_callable_item(actionword_name, Hiptest::Nodes::Actionword)
           add_arguments_from(call, node)

data/lib/hiptest-publisher/nodes.rb

@@ -235,34 +235,6 @@ module Hiptest
       end
     end
 
-    class UIDCall < Node
-      attr_reader :chunks, :extra_inlined_arguments
-      attr_writer :chunks, :extra_inlined_arguments
-
-      def initialize(uid, arguments = [], annotation = nil)
-        super()
-        annotation = nil if annotation == ''
-
-        @children = {
-          uid: uid,
-          arguments: arguments,
-          all_arguments: arguments,
-          annotation: annotation
-        }
-
-        @chunks = []
-        @extra_inlined_arguments = []
-      end
-
-      def free_text_arg
-        children[:arguments].find(&:free_text?)
-      end
-
-      def datatable_arg
-        children[:arguments].find(&:datatable?)
-      end
-    end
-
     class IfThen < Node
       def initialize(condition, then_, else_ = [])
         super()
@@ -370,6 +342,24 @@ module Hiptest
       end
     end
 
+    class LibraryActionword < Item
+      attr_reader :chunks, :extra_inlined_parameters, :uniq_name
+      attr_writer :chunks, :extra_inlined_parameters, :uniq_name
+
+      def initialize(name, tags = [], parameters = [], body = [], uid = nil, description = '')
+        super(name, tags, description, parameters, body)
+        @children[:uid] = uid
+
+        @chunks = []
+        @extra_inlined_parameters = []
+        @uniq_name = name
+      end
+
+      def must_be_implemented?
+        @children[:body].empty? || @children[:body].map {|step| step.class}.compact.include?(Hiptest::Nodes::Step)
+      end
+    end
+
     class Scenario < Item
       attr_reader :folder_uid, :order_in_parent
 
@@ -567,11 +557,11 @@ module Hiptest
     end
 
     class Library < Node
-      def initialize(name = 'default_library', actionwords = [])
+      def initialize(name = 'default_library', library_actionwords = [])
         super()
         @children = {
           name: name,
-          actionwords: actionwords
+          library_actionwords: library_actionwords
         }
       end
     end

data/lib/hiptest-publisher/render_context_maker.rb

@@ -28,9 +28,7 @@ module Hiptest
         extra_inlined_parameters: aw.extra_inlined_parameters || [],
         has_free_text_parameter?: aw.children[:parameters].select(&:free_text?).count > 0,
         has_datatable_parameter?: aw.children[:parameters].select(&:datatable?).count > 0,
-        uniq_name: aw.uniq_name,
-        has_library?: (aw.parent.is_a? Hiptest::Nodes::Library) ? true : false,
-        library_name: aw.parent.nil? ? '' : aw.parent.children[:name]
+        uniq_name: aw.uniq_name
       )
     end
 
@@ -101,6 +99,7 @@ module Hiptest
       {
         has_arguments?: !c.children[:arguments].empty?,
         has_annotation?: !c.children[:annotation].nil?,
+        is_shared?: !c.children[:library_name].nil?,
         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 || [],
@@ -108,15 +107,6 @@ module Hiptest
       }
     end
 
-    def walk_uidcall(uidcall)
-      {
-        has_library?: !uidcall.children[:library_name].nil?,
-        has_annotation?: !uidcall.children[:annotation].nil?,
-        in_actionword?: uidcall.parent.is_a?(Hiptest::Nodes::Actionword),
-        chunks: uidcall.chunks || []
-      }
-    end
-
     def walk_ifthen(it)
       {
         has_else?: !it.children[:else].empty?
@@ -153,6 +143,12 @@ module Hiptest
       }
     end
 
+    def walk_libraryactionword(aw)
+      walk_actionword(aw).merge(
+        library_name: aw.parent.children[:name]
+      )
+    end
+
     def walk_libraries(libraries)
       {
         library_names: libraries.children[:libraries].map {|lib| lib.children[:name]}

data/lib/hiptest-publisher/renderer_addons/gherkin_addon.rb

@@ -14,18 +14,6 @@ module Hiptest
       super(call)
     end
 
-    def walk_uidcall(call)
-      if call.free_text_arg
-        @rendered_children[:free_text_arg] = rendered_freetext_arg(call)
-      end
-
-      if call.datatable_arg
-        @rendered_children[:datatable_arg] = rendered_datatable_arg(call)
-      end
-
-      super(call)
-    end
-
     def walk_folder(folder)
       @rendered_children[:ancestor_tags] = ancestor_tags(folder)
 

data/lib/hiptest-publisher/renderer_addons/groovy_spock_addon.rb

@@ -7,12 +7,6 @@ module Hiptest
       use_annotation(call, base)
     end
 
-    def walk_uidcall(uidcall)
-      base = super(uidcall)
-      use_annotation(uidcall, base)
-    end
-
-
     private
 
     def use_annotation(call, base)
@@ -29,7 +23,7 @@ module Hiptest
       return false unless call.children[:annotation].nil? || ignore_case_equal?(call.children[:annotation], 'then')
 
       return call.parent.children[:body].select do |step|
-        (step.is_a?(Hiptest::Nodes::Call) || step.is_a?(Hiptest::Nodes::UIDCall)) && !step.children[:annotation].nil? && ignore_case_equal?(step.children[:annotation], 'when')
+        step.is_a?(Hiptest::Nodes::Call) && !step.children[:annotation].nil? && ignore_case_equal?(step.children[:annotation], 'when')
       end.empty?
     end
 

data/lib/hiptest-publisher/signature_exporter.rb

@@ -24,7 +24,7 @@ module Hiptest
       {
         'name' => library.children[:name],
         'type' => 'library',
-        'actionwords' => library.children[:actionwords].map {|aw| export_actionword(aw, export_nodes) }
+        'actionwords' => library.children[:library_actionwords].map {|aw| export_actionword(aw, export_nodes) }
       }
     end
 

data/lib/hiptest-publisher/xml_parser.rb

@@ -122,13 +122,6 @@ module Hiptest
         css_first_content(call, '> annotation'))
     end
 
-    def build_uidcall(uid_call)
-      Hiptest::Nodes::UIDCall.new(
-        css_first_content(uid_call, '> uid'),
-        build_arguments(uid_call),
-        css_first_content(uid_call, '> annotation'))
-    end
-
     def build_arguments(arguments)
       build_node_list(arguments.css('> arguments > argument'))
     end
@@ -205,7 +198,16 @@ module Hiptest
         css_first_content(actionword, '> uid'),
         css_first_content(actionword, '> description'))
     end
-    alias :build_libraryActionword :build_actionword
+
+    def build_libraryActionword(libraryActionword)
+      Hiptest::Nodes::LibraryActionword.new(
+        css_first_content(libraryActionword, '> name'),
+        build_tags(libraryActionword),
+        build_parameters(libraryActionword),
+        build_steps(libraryActionword),
+        css_first_content(libraryActionword, '> uid'),
+        css_first_content(libraryActionword, '> description'))
+    end
 
     def build_actionwordSnapshot(actionword)
       Hiptest::Nodes::Actionword.new(

data/lib/templates/behat/actionword.hbs

@@ -3,6 +3,6 @@
  * @{{{ rendered_children.gherkin_annotation }}} /{{> gherkin_pattern}}/
  */
 public function {{{ camelize_lower rendered_children.name }}}({{#if has_parameters?}}{{{ join rendered_children.parameters_ordered_by_pattern ', '}}}{{/if}}){{#curly}}{{#indent}}
-$this->actionwords->{{#if has_library?}}get{{{camelize library_name}}}Library()->{{/if}}{{{ camelize_lower rendered_children.name }}}({{#if has_parameters?}}{{#join raw_parameter_names ', '}}${{{underscore this}}}{{/join}}{{/if}});
+$this->actionwords->{{{ camelize_lower rendered_children.name }}}({{#if has_parameters?}}{{#join raw_parameter_names ', '}}${{{underscore this}}}{{/join}}{{/if}});
 {{/indent}}
 {{/curly}}{{/if}}

data/lib/templates/behat/library.hbs

@@ -10,7 +10,7 @@ class {{camelize rendered_children.name}}FeatureContext implements SnippetAccept
 public function __construct() {{#curly}}{{#indent}}
 $this->actionwords = new Actionwords();{{/indent}}
 {{/curly}}
-{{#each rendered_children.actionwords}}
+{{#each rendered_children.library_actionwords}}
 {{{this}}}{{/each}}{{/indent}}
 {{/curly}}
 ?>

data/lib/templates/behat/libraryactionword.hbs

@@ -0,0 +1,8 @@
+{{#if rendered_children.gherkin_annotation }}
+/**
+ * @{{{ rendered_children.gherkin_annotation }}} /{{> gherkin_pattern}}/
+ */
+public function {{{ camelize_lower rendered_children.name }}}({{#if has_parameters?}}{{{ join rendered_children.parameters_ordered_by_pattern ', '}}}{{/if}}){{#curly}}{{#indent}}
+$this->actionwords->get{{{camelize library_name}}}Library()->{{{ camelize_lower rendered_children.name }}}({{#if has_parameters?}}{{#join raw_parameter_names ', '}}${{{underscore this}}}{{/join}}{{/if}});
+{{/indent}}
+{{/curly}}{{/if}}

data/lib/templates/cucumber/groovy/step-definitions/actionword.hbs

@@ -1,5 +1,5 @@
 {{#if rendered_children.gherkin_annotation }}{{{ rendered_children.gherkin_annotation }}}(~"^{{#escape_backslashes_and_double_quotes}}{{> gherkin_pattern}}{{/escape_backslashes_and_double_quotes}}\$") {{#curly}} {{{ join rendered_children.parameters_ordered_by_pattern ', '}}} ->{{#indent}}
-{{{ context.call_prefix }}}.{{#if has_library?}}get{{{camelize library_name}}}Library().{{/if}}{{{camelize_lower uniq_name}}}({{#if has_parameters?}}{{#join raw_parameter_names ', '}}{{{camelize_lower this}}}{{/join}}{{/if}})
+{{{ context.call_prefix }}}.{{{camelize_lower uniq_name}}}({{#if has_parameters?}}{{#join raw_parameter_names ', '}}{{{camelize_lower this}}}{{/join}}{{/if}})
 {{/indent}}
 {{/curly}}
 {{/if}}

data/lib/templates/cucumber/groovy/step-definitions/library.hbs

@@ -6,5 +6,5 @@ this.metaClass.mixin(cucumber.api.groovy.EN)
 
 Actionwords {{{ context.call_prefix }}} = new Actionwords()
 
-{{#each rendered_children.actionwords}}{{{this}}}
+{{#each rendered_children.library_actionwords}}{{{this}}}
 {{/each}}

data/lib/templates/cucumber/groovy/step-definitions/libraryactionword.hbs

@@ -0,0 +1,5 @@
+{{#if rendered_children.gherkin_annotation }}{{{ rendered_children.gherkin_annotation }}}(~"^{{#escape_backslashes_and_double_quotes}}{{> gherkin_pattern}}{{/escape_backslashes_and_double_quotes}}\$") {{#curly}} {{{ join rendered_children.parameters_ordered_by_pattern ', '}}} ->{{#indent}}
+{{{ context.call_prefix }}}.get{{{camelize library_name}}}Library().{{{camelize_lower uniq_name}}}({{#if has_parameters?}}{{#join raw_parameter_names ', '}}{{{camelize_lower this}}}{{/join}}{{/if}})
+{{/indent}}
+{{/curly}}
+{{/if}}

data/lib/templates/groovy/call.hbs

@@ -1,2 +1,2 @@
 {{#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 ', '}}})
+{{/if}}{{/unless}}{{#if context.call_prefix}}{{{context.call_prefix}}}.{{/if}}{{#if is_shared?}}get{{camelize rendered_children.library_name}}Library().{{/if}}{{{ camelize_lower rendered_children.actionword }}}({{{ join rendered_children.all_arguments ', '}}})

data/lib/templates/groovy/library.hbs

@@ -1,7 +1,7 @@
 package {{{ context.package }}}
 
 @Singleton
-class {{camelize rendered_children.name}}Library {{#curly}}{{#indent}}{{#each rendered_children.actionwords}}
+class {{camelize rendered_children.name}}Library {{#curly}}{{#indent}}{{#each rendered_children.library_actionwords}}
 {{{this}}}
 {{/each}}
 {{/indent}}

data/lib/templates/groovy/libraryactionword.hbs

@@ -0,0 +1,2 @@
+def {{{camelize_lower uniq_name }}}({{#if has_parameters?}}{{{join rendered_children.parameters ', '}}}{{/if}}) {{#curly}}{{#indent}}{{> desc}}{{> steps}}{{/indent}}
+{{/curly}}

data/lib/templates/java/call.hbs

@@ -1,2 +1,2 @@
 {{#if has_annotation? }}{{#comment '//'}}{{{ rendered_children.gherkin_text }}}{{/comment}}
-{{/if}}{{#if context.call_prefix}}{{{context.call_prefix}}}.{{/if}}{{{ camelize_lower rendered_children.actionword }}}({{{ join rendered_children.all_arguments ', '}}});
+{{/if}}{{#if context.call_prefix}}{{{context.call_prefix}}}.{{/if}}{{#if is_shared?}}get{{camelize rendered_children.library_name}}Library().{{/if}}{{{ camelize_lower rendered_children.actionword }}}({{{ join rendered_children.all_arguments ', '}}});

data/lib/templates/java/library.hbs

@@ -1,6 +1,6 @@
 package {{{ context.package }}};
 
-public class {{camelize rendered_children.name}}Library extends ActionwordLibrary {{#curly}}{{#indent}}{{#each rendered_children.actionwords}}
+public class {{camelize rendered_children.name}}Library extends ActionwordLibrary {{#curly}}{{#indent}}{{#each rendered_children.library_actionwords}}
 {{{this}}}
 {{/each}}
 {{/indent}}

data/lib/templates/java/libraryactionword.hbs

@@ -0,0 +1 @@
+{{> item_as_function}}

data/lib/templates/php/call.hbs

@@ -1,2 +1,2 @@
 {{#if has_annotation? }}{{#comment '//'}}{{{ rendered_children.gherkin_text }}}{{/comment}}
-{{/if}}{{#if context.call_prefix}}{{{ context.call_prefix }}}->{{/if}}{{{ camelize_lower rendered_children.actionword }}}({{{ join rendered_children.all_arguments ', '}}});
+{{/if}}{{#if context.call_prefix}}{{{ context.call_prefix }}}->{{/if}}{{#if is_shared?}}get{{{camelize rendered_children.library_name}}}Library()->{{/if}}{{{ camelize_lower rendered_children.actionword }}}({{{ join rendered_children.all_arguments ', '}}});

data/lib/templates/php/library.hbs

@@ -12,7 +12,7 @@ self::$_instance = new {{camelize rendered_children.name}}Library();
 return self::$_instance;
 {{/indent}}
 {{/curly}}
-{{#each rendered_children.actionwords}}
+{{#each rendered_children.library_actionwords}}
 {{{this}}}
 {{/each}}
 {{/indent}}

data/lib/templates/php/libraryactionword.hbs

@@ -0,0 +1 @@
+{{> item_as_function }}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiptest-publisher
 version: !ruby/object:Gem::Version
-  version: 1.22.0
+  version: 1.23.1
 platform: ruby
 authors:
 - HipTest R&D
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-30 00:00:00.000000000 Z
+date: 2019-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -252,7 +252,7 @@ files:
 - lib/hiptest-publisher/formatters/reporter.rb
 - lib/hiptest-publisher/handlebars_helper.rb
 - lib/hiptest-publisher/indexers/actionword_indexer.rb
-- lib/hiptest-publisher/indexers/actionword_uid_indexer.rb
+- lib/hiptest-publisher/indexers/library_actionword_indexer.rb
 - lib/hiptest-publisher/node_modifiers/actionword_uniq_renamer.rb
 - lib/hiptest-publisher/node_modifiers/add_all.rb
 - lib/hiptest-publisher/node_modifiers/call_arguments_adder.rb
@@ -261,7 +261,6 @@ files:
 - lib/hiptest-publisher/node_modifiers/items_orderer.rb
 - lib/hiptest-publisher/node_modifiers/parameter_type_adder.rb
 - lib/hiptest-publisher/node_modifiers/parent_adder.rb
-- lib/hiptest-publisher/node_modifiers/uid_call_reference_adder.rb
 - lib/hiptest-publisher/nodes.rb
 - lib/hiptest-publisher/nodes_walker.rb
 - lib/hiptest-publisher/options_parser.rb
@@ -282,6 +281,7 @@ files:
 - lib/templates/behat/actionwords.hbs
 - lib/templates/behat/actionwords/parameter.hbs
 - lib/templates/behat/library.hbs
+- lib/templates/behat/libraryactionword.hbs
 - lib/templates/behat/parameter.hbs
 - lib/templates/behave/actionword.hbs
 - lib/templates/behave/actionwords.hbs
@@ -334,6 +334,7 @@ files:
 - lib/templates/cucumber/groovy/step-definitions/actionword.hbs
 - lib/templates/cucumber/groovy/step-definitions/actionwords.hbs
 - lib/templates/cucumber/groovy/step-definitions/library.hbs
+- lib/templates/cucumber/groovy/step-definitions/libraryactionword.hbs
 - lib/templates/cucumber/groovy/step-definitions/parameter.hbs
 - lib/templates/cucumber/java/actionword.hbs
 - lib/templates/cucumber/java/actionwords.hbs
@@ -367,7 +368,6 @@ files:
 - lib/templates/gherkin/stringliteral.hbs
 - lib/templates/gherkin/tag.hbs
 - lib/templates/gherkin/template.hbs
-- lib/templates/gherkin/uidcall.hbs
 - lib/templates/groovy/_body.hbs
 - lib/templates/groovy/_desc.hbs
 - lib/templates/groovy/_scenario.hbs
@@ -384,6 +384,7 @@ files:
 - lib/templates/groovy/index.hbs
 - lib/templates/groovy/libraries.hbs
 - lib/templates/groovy/library.hbs
+- lib/templates/groovy/libraryactionword.hbs
 - lib/templates/groovy/list.hbs
 - lib/templates/groovy/nullliteral.hbs
 - lib/templates/groovy/parameter.hbs
@@ -395,7 +396,6 @@ files:
 - lib/templates/groovy/template.hbs
 - lib/templates/groovy/test.hbs
 - lib/templates/groovy/tests.hbs
-- lib/templates/groovy/uidcall.hbs
 - lib/templates/java/_body.hbs
 - lib/templates/java/_item_as_function.hbs
 - lib/templates/java/_scenario.hbs
@@ -420,6 +420,7 @@ files:
 - lib/templates/java/index.hbs
 - lib/templates/java/libraries.hbs
 - lib/templates/java/library.hbs
+- lib/templates/java/libraryactionword.hbs
 - lib/templates/java/list.hbs
 - lib/templates/java/nullliteral.hbs
 - lib/templates/java/parameter.hbs
@@ -442,7 +443,6 @@ files:
 - lib/templates/java/testng/single_test.hbs
 - lib/templates/java/testng/tests.hbs
 - lib/templates/java/tests.hbs
-- lib/templates/java/uidcall.hbs
 - lib/templates/java/variable.hbs
 - lib/templates/java/while.hbs
 - lib/templates/javascript/_body.hbs
@@ -515,6 +515,7 @@ files:
 - lib/templates/php/index.hbs
 - lib/templates/php/libraries.hbs
 - lib/templates/php/library.hbs
+- lib/templates/php/libraryactionword.hbs
 - lib/templates/php/list.hbs
 - lib/templates/php/nullliteral.hbs
 - lib/templates/php/parameter.hbs
@@ -530,7 +531,6 @@ files:
 - lib/templates/php/template.hbs
 - lib/templates/php/test.hbs
 - lib/templates/php/tests.hbs
-- lib/templates/php/uidcall.hbs
 - lib/templates/php/variable.hbs
 - lib/templates/php/while.hbs
 - lib/templates/python/_body.hbs
@@ -667,7 +667,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Export your tests from HipTest into executable tests.

data/lib/hiptest-publisher/indexers/actionword_uid_indexer.rb

@@ -1,34 +0,0 @@
-module Hiptest
-  class ActionwordUidIndexer
-    def initialize(project)
-      @project = project
-      @indexed = {}
-      index_actionwords
-    end
-
-    def index_actionwords
-      @project.children[:actionwords].children[:actionwords].each do |actionword|
-        index_actionword(actionword)
-      end
-
-      @project.children[:libraries].children[:libraries].each do |library|
-        library.children[:actionwords].each do |actionword|
-          index_actionword(actionword, library: library)
-        end
-      end
-    end
-
-    def get_index(uid)
-      @indexed[uid]
-    end
-
-    private
-
-    def index_actionword(actionword, library: nil)
-      @indexed[actionword.children[:uid]] = {
-        actionword: actionword,
-        library: library
-      }
-    end
-  end
-end

data/lib/hiptest-publisher/node_modifiers/uid_call_reference_adder.rb

@@ -1,30 +0,0 @@
-require 'hiptest-publisher/indexers/actionword_uid_indexer'
-require 'hiptest-publisher/nodes'
-
-module Hiptest
-  module NodeModifiers
-    class UidCallReferencerAdder
-      def self.add(project)
-        self.new(project).update_uid_calls
-      end
-
-      def initialize(project)
-        @project = project
-        @indexer = ActionwordUidIndexer.new(project)
-      end
-
-      def update_uid_calls
-        @project.each_sub_nodes(Hiptest::Nodes::UIDCall) do |uid_call|
-          index = @indexer.get_index(uid_call.children[:uid])
-          if index.nil?
-            uid_call.children[:actionword_name] = "Unknown actionword with UID: #{uid_call.children[:uid]}"
-            next
-          end
-
-          uid_call.children[:actionword_name] = index[:actionword].children[:name]
-          uid_call.children[:library_name] = index[:library].children[:name] unless index[:library].nil?
-        end
-      end
-    end
-  end
-end

data/lib/templates/gherkin/uidcall.hbs

@@ -1 +0,0 @@
-{{> call}}

data/lib/templates/groovy/uidcall.hbs

@@ -1,2 +0,0 @@
-{{#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}}{{#if has_library?}}get{{{camelize rendered_children.library_name}}}Library().{{/if}}{{{ camelize_lower rendered_children.actionword_name }}}({{{ join rendered_children.all_arguments ', '}}})

data/lib/templates/java/uidcall.hbs

@@ -1 +0,0 @@
-{{#if context.call_prefix}}{{{context.call_prefix}}}.{{/if}}{{#if has_library?}}get{{{camelize rendered_children.library_name}}}Library().{{/if}}{{{ camelize_lower rendered_children.actionword_name }}}({{{ join rendered_children.all_arguments ', '}}});

data/lib/templates/php/uidcall.hbs

@@ -1,2 +0,0 @@
-{{#if has_annotation? }}{{#comment '//'}}{{{ rendered_children.gherkin_text }}}{{/comment}}
-{{/if}}{{#if context.call_prefix}}{{{ context.call_prefix }}}->{{/if}}{{#if has_library?}}get{{{camelize rendered_children.library_name}}}Library()->{{/if}}{{{ camelize_lower rendered_children.actionword_name }}}({{{ join rendered_children.all_arguments ', '}}});