hiptest-publisher 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c8a02db3a799b5e2e155b033bd99540a6004f10548d8e96b8790bd0db7754f7
-  data.tar.gz: 7a72e7b6b64462ef50e77a9e22bf32bf380f427a3fc859ab5019e7943efe7cf8
+  metadata.gz: bf3135292196dceadbed7955498ce586d8f08b075a3bab0323efd92403876835
+  data.tar.gz: 6af5171a3e54d523bdcd79970e8847f1e94e89019a7c33a98e3436de27f44b47
 SHA512:
-  metadata.gz: d21c08e718c31874d666d125699a800269a0b2c816b51c02f1559abbfa16dc4db96e56b67a0e2de09249f27ee099f533bba39ee04a8ff8c27731ca05fc249e69
-  data.tar.gz: 6bfef4d36438d2c457e13b6a4f0b308b90f207be612e9abe52ea138362f094f7d0c07531781e7c4e83ed3c7b11c368bb36e6dcecc8d88f8b32e0d2992864e9cc
+  metadata.gz: 1d7e65e2f1d31e605cb24a48cc1cb8c87137098571b76da485fc2513dd5795fabe81e561ea102f2e7fc17462b8389aa0ab1d0a05979436ccf3c62540cd3ca057
+  data.tar.gz: 3c5d13ec78ba4f3fa828ec053652a05f29cdb1f23c1a0e266efd3611c851c4b38c53b3d9eef8b41a0a3a58c0538420a3aa2c21220516d920a66175fe80734b74

data/README.md

@@ -127,7 +127,7 @@ Specific options:
     -p, --push=FILE.TAP              Push a results file to the server
         --global-failure-on-missing-reports
                                      When there is no results file to push, report a global failure (default: false)
-        --push-format=tap            Format of the test results (junit, nunit, tap, robot) (default: tap)
+        --push-format=tap            Format of the test results (cucumber-json, junit, nunit, robot, tap) (default: tap)
         --sort=[id,order,alpha]      Sorting of tests in output: id will sort them by age, order will keep the same order than in hiptest (only with --with-folders option, will fallback to id otherwise), alpha will sort them by name (default: order)
         --[no-]uids                  Export UIDs (note: can be disabled only for Gherkin-based exports, may cause issue when pushing results back) (default: true)
         --keep-filenames             Keep the same name as in Hiptest for the test files (note: may cause encoding issues) (default: false)
@@ -182,7 +182,7 @@ The tests must then generate a test report that is supported by Hiptest. Current
  - [TAP (Test Anything Protocol)](https://testanything.org/)
  - Robot framework XML output
 
-You can specify the type of export when pushing by using the option "--push-format=[junit|nunit|tap|robot]" or specifying it in the config file.
+You can specify the type of export when pushing by using the option "--push-format=[cucumber-json|junit|nunit|robot|tap]" or specifying it in the config file.
 
 You can push multiple files at once (using wildcard) but in that case, do not forget to add quotes. For examples:
 

data/lib/config/behat.conf

@@ -8,6 +8,7 @@ node_name = folders
 template_dirs = gherkin, common
 named_filename = '%s.feature'
 filename_convention = 'underscore'
+renderer_addons = 'GherkinAddon'
 
 [step_definitions]
 node_name = actionwords
@@ -15,6 +16,7 @@ template_dirs = behat, php, common
 filename = 'FeatureContext.php'
 naming_convention = 'camelize'
 call_prefix = 'self.actionwords'
+renderer_addons = 'GherkinAddon'
 
 [actionwords]
 template_dirs = behat/actionwords, php, common

data/lib/config/behave.conf

@@ -8,6 +8,7 @@ node_name = folders
 template_dirs = gherkin/inlined_uids, gherkin, common
 named_filename = '%s.feature'
 filename_convention = 'underscore'
+renderer_addons = 'GherkinAddon'
 
 [step_definitions]
 node_name = actionwords
@@ -15,7 +16,7 @@ template_dirs = behave, python, common
 filename = 'steps.py'
 naming_convention = 'underscore'
 call_prefix = 'self.actionwords'
-renderer_addons = 'BehaveAddon'
+renderer_addons = 'GherkinAddon BehaveAddon'
 
 [actionwords]
 template_dirs = python, common

data/lib/config/cucumber-groovy.conf

@@ -0,0 +1,25 @@
+[_common]
+package = 'com.example'
+fallback_template = 'empty'
+indentation = '    '
+dirname_convention = 'underscore'
+filename_convention = 'camelize'
+naming_convention = 'camelize_lower'
+
+[features]
+node_name = folders
+template_dirs = gherkin/inlined_uids, gherkin/java, gherkin, common
+named_filename = '%s.feature'
+indentation = '  '
+renderer_addons = 'GherkinAddon'
+
+[step_definitions]
+node_name = actionwords
+template_dirs = cucumber/groovy/step-definitions, groovy, java, common
+filename = 'StepDefinitions.groovy'
+call_prefix = 'actionwords'
+renderer_addons = 'GherkinAddon'
+
+[actionwords]
+template_dirs = cucumber/groovy/actionwords, groovy, java, common
+filename = 'Actionwords.groovy'

data/lib/config/cucumber-java.conf

@@ -8,6 +8,7 @@ node_name = folders
 template_dirs = gherkin/inlined_uids, gherkin/java, gherkin, common
 named_filename = '%s.feature'
 indentation = '  '
+renderer_addons = 'GherkinAddon'
 
 [step_definitions]
 node_name = actionwords
@@ -15,6 +16,7 @@ template_dirs = cucumber/java, java, common
 filename = 'StepDefinitions.java'
 naming_convention = 'camelize_lower'
 call_prefix = 'actionwords'
+renderer_addons = 'GherkinAddon'
 
 [actionwords]
 template_dirs = cucumber/java/actionwords, java, common

data/lib/config/cucumber-javascript.conf

@@ -7,6 +7,7 @@ node_name = folders
 template_dirs = gherkin/inlined_uids, gherkin, common
 named_filename = '%s.feature'
 indentation = '  '
+renderer_addons = 'GherkinAddon'
 
 [step_definitions]
 node_name = actionwords
@@ -14,6 +15,7 @@ template_dirs = cucumber/javascript, javascript, common
 filename = 'step_definitions.js'
 naming_convention = 'camelize_lower'
 call_prefix = 'actionwords'
+renderer_addons = 'GherkinAddon'
 
 [actionwords]
 template_dirs = javascript/es6, javascript, common

data/lib/config/cucumber-ruby.conf

@@ -7,12 +7,14 @@ node_name = folders
 template_dirs = gherkin, common
 named_filename = '%s.feature'
 filename_convention = 'underscore'
+renderer_addons = 'GherkinAddon'
 
 [step_definitions]
 node_name = actionwords
 template_dirs = cucumber, common
 filename = 'step_definitions.rb'
 naming_convention = 'underscore'
+renderer_addons = 'GherkinAddon'
 
 [actionwords]
 template_dirs = ruby, common

data/lib/config/jbehave.conf

@@ -8,6 +8,7 @@ node_name = folders
 template_dirs = jbehave, gherkin/inlined_uids, gherkin/java, gherkin, common
 named_filename = '%s.story'
 indentation = '  '
+renderer_addons = 'GherkinAddon'
 
 [step_definitions]
 node_name = actionwords
@@ -15,6 +16,7 @@ template_dirs = jbehave/steps, jbehave/actionwords, java, common
 filename = 'StepDefinitions.java'
 naming_convention = 'camelize_lower'
 call_prefix = 'actionwords'
+renderer_addons = 'GherkinAddon'
 
 [actionwords]
 template_dirs = jbehave/actionwords, java, common

data/lib/config/robotframework.conf

@@ -6,6 +6,7 @@ indentation = "\t"
 filename = 'test_project.txt'
 named_filename = 'test_%s.txt'
 filename_convention = 'underscore'
+renderer_addons = 'RobotFrameworkAddon'
 
 [actionwords]
 filename = 'keywords.txt'

data/lib/config/specflow.conf

@@ -9,6 +9,7 @@ node_name = folders
 template_dirs = specflow/gherkin, gherkin, common
 named_filename = '%s.feature'
 filename_convention = 'camelize_upper'
+renderer_addons = 'GherkinAddon'
 
 [step_definitions]
 node_name = actionwords
@@ -16,6 +17,7 @@ template_dirs = specflow, csharp, common
 filename = 'StepDefinitions.cs'
 naming_convention = 'camelize_upper'
 call_prefix = 'Actionwords'
+renderer_addons = 'GherkinAddon'
 
 [actionwords]
 template_dirs = specflow/actionwords, csharp, common

data/lib/hiptest-publisher.rb

@@ -288,7 +288,7 @@ module Hiptest
         "",
         "  * Did you specify the correct push format ?",
         "    Use push_format=<format> in your config file or option --push-format=<format> in the command line",
-        "    Available formats are: tap, junit, robot, nunit",
+        "    Available formats are: cucumber-json, junit, nunit, robot, tap",
         ""
       ].join("\n")
     end

data/lib/hiptest-publisher/options_parser.rb

@@ -188,7 +188,7 @@ class OptionsParser
 
     {
       'Ruby' => ['Rspec', 'MiniTest'],
-      'Cucumber' => ['Ruby', 'Java', 'Javascript'],
+      'Cucumber' => ['Ruby', 'Java', 'Javascript', 'Groovy'],
       'Java' => ['JUnit', 'Test NG', 'Espresso'],
       'Python' => ['Unittest'],
       'Robot Framework' => [''],
@@ -235,7 +235,7 @@ class OptionsParser
       Option.new('s', 'site=SITE', 'https://app.hiptest.com', String, "Site to fetch from", :site),
       Option.new('p', 'push=FILE.TAP', '', String, "Push a results file to the server", :push),
       Option.new(nil, 'global-failure-on-missing-reports', false, nil, "When there is no results file to push, report a global failure", :global_failure_on_missing_reports),
-      Option.new(nil, 'push-format=tap', 'tap', String, "Format of the test results (junit, nunit, tap, robot)", :push_format),
+      Option.new(nil, 'push-format=tap', 'tap', String, "Format of the test results (cucumber-json, junit, nunit, robot, tap)", :push_format),
       Option.new(nil, 'sort=[id,order,alpha]', 'order', String, "Sorting of tests in output: id will sort them by age, order will keep the same order than in hiptest (only with --with-folders option, will fallback to id otherwise), alpha will sort them by name", :sort),
       Option.new(nil, '[no-]uids', true, nil, 'Export UIDs (note: can be disabled only for Gherkin-based exports, may cause issue when pushing results back)', :uids),
       Option.new(nil, 'with-dataset-names', false, nil, 'Export dataset name when creating feature files (note: available only for Gherkin-based exports)', :with_dataset_names),

data/lib/hiptest-publisher/renderer.rb

@@ -23,37 +23,6 @@ module Hiptest
       @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 = {}
@@ -75,38 +44,5 @@ module Hiptest
 
       @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]],
-              test_snapshot_uid: @rendered[dataset.children[:test_snapshot_uid]],
-              arguments: @rendered[dataset.children[:arguments]]
-            }
-          },
-          parameters:  @rendered[sc.children[:parameters]],
-          body: @rendered[sc.children[:body]]
-        }
-      }
-    end
   end
 end

data/lib/hiptest-publisher/renderer_addons.rb

@@ -1,2 +1,4 @@
 require 'hiptest-publisher/renderer_addons/behave_addon'
+require 'hiptest-publisher/renderer_addons/gherkin_addon'
 require 'hiptest-publisher/renderer_addons/groovy_spock_addon'
+require 'hiptest-publisher/renderer_addons/robot_framework_addon'

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

@@ -0,0 +1,39 @@
+require 'hiptest-publisher/nodes'
+
+module Hiptest
+  module GherkinAddon
+
+    def walk_call(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)
+
+      super(folder)
+    end
+
+    private
+
+    def rendered_datatable_arg(call)
+      @rendered[call.datatable_arg.children[:value]]
+    end
+
+    def rendered_freetext_arg(call)
+      @rendered[call.free_text_arg.children[:value]]
+    end
+
+    def ancestor_tags(folder)
+      ancestor_tags = folder.ancestors.map {|f| f.children[:tags]}.flatten.uniq
+      ancestor_tags.map {|t| Hiptest::Renderer.render(t, @context)}
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+require 'hiptest-publisher/nodes'
+
+module Hiptest
+  module RobotFrameworkAddon
+    def walk_folder(folder)
+      walk_scenario_container(folder)
+      super(folder)
+    end
+
+    def walk_scenarios(scenarios)
+      walk_scenario_container(scenarios)
+      super(scenarios)
+    end
+
+    private
+
+    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]],
+              test_snapshot_uid: @rendered[dataset.children[:test_snapshot_uid]],
+              arguments: @rendered[dataset.children[:arguments]]
+            }
+          },
+          parameters:  @rendered[sc.children[:parameters]],
+          body: @rendered[sc.children[:body]]
+        }
+      }
+    end
+  end
+end

data/lib/templates/cucumber/groovy/actionwords/actionwords.hbs

@@ -0,0 +1,7 @@
+package {{{ context.package }}}
+
+class Actionwords {{#curly}}{{#indent}}{{#each rendered_children.actionwords}}
+{{{this}}}
+{{/each}}
+{{/indent}}
+{{/curly}}

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

@@ -0,0 +1 @@
+{{#strip}}{{#join chunks '"'}}{{this.value}}{{/join}}{{#each extra_inlined_parameters}} "{{this.value}}"{{/each}}{{/strip}}

data/lib/templates/cucumber/groovy/step-definitions/actionword.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 }}}.{{{camelize_lower rendered_children.name}}}({{#if has_parameters?}}{{#join raw_parameter_names ', '}}{{{camelize_lower this}}}{{/join}}{{/if}})
+{{/indent}}
+{{/curly}}
+{{/if}}

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

@@ -0,0 +1,10 @@
+package {{{ context.package }}}
+
+import cucumber.api.DataTable
+
+this.metaClass.mixin(cucumber.api.groovy.EN)
+
+Actionwords {{{ context.call_prefix }}} = new Actionwords()
+
+{{#each rendered_children.actionwords}}{{{this}}}
+{{/each}}

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

@@ -0,0 +1 @@
+{{#if is_datatable?}}DataTable{{else}}{{#if is_bool?}}boolean{{else}}{{{ node.type }}}{{/if}}{{/if}} {{{ camelize_lower rendered_children.name }}}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiptest-publisher
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Hiptest R&D
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-04 00:00:00.000000000 Z
+date: 2018-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -228,6 +228,7 @@ files:
 - lib/config/behat.conf
 - lib/config/behave.conf
 - lib/config/csharp-nunit.conf
+- lib/config/cucumber-groovy.conf
 - lib/config/cucumber-java.conf
 - lib/config/cucumber-javascript.conf
 - lib/config/cucumber-ruby.conf
@@ -270,7 +271,9 @@ files:
 - lib/hiptest-publisher/renderer.rb
 - lib/hiptest-publisher/renderer_addons.rb
 - lib/hiptest-publisher/renderer_addons/behave_addon.rb
+- lib/hiptest-publisher/renderer_addons/gherkin_addon.rb
 - lib/hiptest-publisher/renderer_addons/groovy_spock_addon.rb
+- lib/hiptest-publisher/renderer_addons/robot_framework_addon.rb
 - lib/hiptest-publisher/signature_differ.rb
 - lib/hiptest-publisher/signature_exporter.rb
 - lib/hiptest-publisher/string.rb
@@ -327,6 +330,11 @@ files:
 - lib/templates/csharp/while.hbs
 - lib/templates/cucumber/actionword.hbs
 - lib/templates/cucumber/actionwords.hbs
+- lib/templates/cucumber/groovy/actionwords/actionwords.hbs
+- lib/templates/cucumber/groovy/step-definitions/_gherkin_pattern.hbs
+- lib/templates/cucumber/groovy/step-definitions/actionword.hbs
+- lib/templates/cucumber/groovy/step-definitions/actionwords.hbs
+- lib/templates/cucumber/groovy/step-definitions/parameter.hbs
 - lib/templates/cucumber/java/actionword.hbs
 - lib/templates/cucumber/java/actionwords.hbs
 - lib/templates/cucumber/java/actionwords/parameter.hbs