hiptest-publisher 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 535baeb0b46021363d72547b11ec151fd5a960e5
-  data.tar.gz: 938f51f332fe662b41c162fe61b09c63ef5c720c
+  metadata.gz: bd9509d4c5d1aa1a05dd7b333d5b0fc56e983063
+  data.tar.gz: 17c1fac0cddefcd7d8d384b743f08b3d661c789f
 SHA512:
-  metadata.gz: 610f5566ac6761bd4efd888431a2692c01eb8073961c3647c9adf122946273b66c4ed913342b68caec39f27ffd4626292d17e7f1024e449403412ed893284032
-  data.tar.gz: 1931e3f4341117c4d7fe0b877440cf7880c769dacd98a4aee15a5aca288445a21c3b8df75ab034002d18df8a7dcce5c55cc2336c5890796c70ea47e967be597a
+  metadata.gz: aa1108806851adbd98a5acaef2763ed93936c860ca874b5f16cbaccf8963199fd54e1ddef9cd2d05d71305ac6db677d16976a71ecd68091fbc3e4d0fd0b8e8e0
+  data.tar.gz: 6483823f89b6aa87be8d70935281a2c325f2b11786e0902c9297e274e5c0deed8691ea3aef88fbf80cd8800425eccb059987c8918d095a8ee8ec368010dd335c

data/lib/hiptest-publisher/render_context_maker.rb

@@ -83,7 +83,9 @@ 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]))
+        :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)
       }
     end
 

data/lib/templates/groovy/_scenario.hbs

@@ -1,8 +1,8 @@
-def "{{{ escape_double_quotes rendered_children.name }}}{{#if rendered_children.uid}} (uid:{{{  rendered_children.uid}}}){{/if}}"() {{#curly}}{{#indent}}{{> desc}}{{#unless has_annotations?}}{{#unless is_empty?}}
+{{#if has_datasets?}}def {{{ camelize_lower rendered_children.name }}}({{ join rendered_children.parameters ', ' }}) {{#curly}}{{#indent}}{{> desc}}
+{{> steps}}{{/indent}}
+{{/curly}}
+
+{{rendered_children.datatable}}{{else}}def "{{{ escape_double_quotes rendered_children.name }}}{{#if rendered_children.uid}} (uid:{{{  rendered_children.uid}}}){{/if}}"() {{#curly}}{{#indent}}{{> desc}}{{#unless has_annotations?}}{{#unless is_empty?}}
 expect:{{/unless}}{{/unless}}
-{{> steps}}{{#if has_datasets?}}
-where:
-{{ join rendered_children.parameters ' | ' }}{{#if context.uids}} | hiptestUid{{/if}}
-{{rendered_children.datatable}}
-{{/if}}{{/indent}}
-{{/curly}}
+{{> steps}}{{/indent}}
+{{/curly}}{{/if}}

data/lib/templates/groovy/call.hbs

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

data/lib/templates/groovy/dataset.hbs

@@ -1 +1,5 @@
-{{{ join rendered_children.arguments ' | ' }}}{{#if context.uids}} | "uid:{{{rendered_children.uid}}}"{{/if}}
+def "{{{ escape_double_quotes scenario_name }}} - {{{ escape_double_quotes rendered_children.name }}}{{#if rendered_children.uid}} (uid:{{{  rendered_children.uid}}}){{/if}}"() {{#curly}}{{#indent}}
+expect:
+{{{ camelize_lower scenario_name }}}({{{ join rendered_children.arguments ', '}}})
+{{/indent}}
+{{/curly}}

data/lib/templates/groovy/datatable.hbs

@@ -1,2 +1,3 @@
 {{#each rendered_children.datasets}}{{{this}}}
+
 {{/each}}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiptest-publisher
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Hiptest R&D
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-30 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize