hiptest-publisher 1.11.1 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9aed441d2c5e289cc0a6dd6e8e3837cd273309f8
-  data.tar.gz: c931d3440587c60b9f5896eadf1e61dd03584dd5
+SHA256:
+  metadata.gz: 4c8a02db3a799b5e2e155b033bd99540a6004f10548d8e96b8790bd0db7754f7
+  data.tar.gz: 7a72e7b6b64462ef50e77a9e22bf32bf380f427a3fc859ab5019e7943efe7cf8
 SHA512:
-  metadata.gz: 9af7e369dee2a26bb01ad31a1cc40085a1893b85f339be14a763acbaaecc54c3d298d31037a75b06d5c5b15e32aacb537ce939ec19215825f5ca186ba2b669b3
-  data.tar.gz: aba538efc3a191caf6308172835abc0bdf544f9da34a23502ef079d25092fd0958ce0b7141820ba863cd94b0fb85b1b064d8b7c7f2bbf147711fd1d9a4e977c9
+  metadata.gz: d21c08e718c31874d666d125699a800269a0b2c816b51c02f1559abbfa16dc4db96e56b67a0e2de09249f27ee099f533bba39ee04a8ff8c27731ca05fc249e69
+  data.tar.gz: 6bfef4d36438d2c457e13b6a4f0b308b90f207be612e9abe52ea138362f094f7d0c07531781e7c4e83ed3c7b11c368bb36e6dcecc8d88f8b32e0d2992864e9cc

data/README.md

@@ -6,7 +6,6 @@ Hiptest Publisher
 [![Gem Version](https://badge.fury.io/rb/hiptest-publisher.svg)](http://badge.fury.io/rb/hiptest-publisher)
 [![Code Climate](https://codeclimate.com/github/hiptest/hiptest-publisher/badges/gpa.svg)](https://codeclimate.com/github/hiptest/hiptest-publisher)
 [![Test Coverage](https://codeclimate.com/github/hiptest/hiptest-publisher/badges/coverage.svg)](https://codeclimate.com/github/hiptest/hiptest-publisher)
-[![Dependency Status](https://gemnasium.com/hiptest/hiptest-publisher.svg)](https://gemnasium.com/hiptest/hiptest-publisher)
 
 
 Installing
@@ -93,6 +92,7 @@ You could obtain for example:
 
 ```shell
 Exports tests from Hiptest for automation.
+
 Specific options:
     -t, --token=TOKEN                Secret token (available in your project settings)
     -l, --language=LANG              Target language (default: ruby)
@@ -110,6 +110,8 @@ Specific options:
         --actionwords-only           (deprecated) alias for --only=actionwords (default: false)
         --actionwords-signature      Export actionwords signature (default: false)
         --show-actionwords-diff      Show actionwords diff since last update (summary) (default: false)
+        --show-actionwords-diff-as-json
+                                     Show actionwords diff since last update (JSON output) (default: false)
         --show-actionwords-deleted   Output signature of deleted action words (default: false)
         --show-actionwords-created   Output code for new action words (default: false)
         --show-actionwords-renamed   Output signatures of renamed action words (default: false)
@@ -123,6 +125,8 @@ Specific options:
         --leafless-export            Use only last level action word (default: false)
     -s, --site=SITE                  Site to fetch from (default: https://app.hiptest.com)
     -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)
         --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)
@@ -137,6 +141,7 @@ Specific options:
         --filter-on-status=STATUS    Filter on test status in last build (use in conjunction with a test run)
         --not-recursive              Used in conjunction with filter-on-folder-ids or filter-on-folder-name: only exports those folders, not their children (default: false)
         --check-version              Check if a new release of hiptest-publisher is available (default: false)
+        --force                      Force overwrite of existing files (do not apply to test files) (default: false)
     -v, --verbose                    Run verbosely (default: false)
     -H, --languages-help             Show languages and framework options
     -h, --help                       Show this message

data/lib/config/behave.conf

@@ -15,6 +15,7 @@ template_dirs = behave, python, common
 filename = 'steps.py'
 naming_convention = 'underscore'
 call_prefix = 'self.actionwords'
+renderer_addons = 'BehaveAddon'
 
 [actionwords]
 template_dirs = python, common

data/lib/config/jbehave.conf

@@ -0,0 +1,22 @@
+[_common]
+package = 'com.example'
+indentation = '    '
+fallback_template = 'empty'
+
+[stories]
+node_name = folders
+template_dirs = jbehave, gherkin/inlined_uids, gherkin/java, gherkin, common
+named_filename = '%s.story'
+indentation = '  '
+
+[step_definitions]
+node_name = actionwords
+template_dirs = jbehave/steps, jbehave/actionwords, java, common
+filename = 'StepDefinitions.java'
+naming_convention = 'camelize_lower'
+call_prefix = 'actionwords'
+
+[actionwords]
+template_dirs = jbehave/actionwords, java, common
+filename = 'Actionwords.java'
+naming_convention = 'camelize_lower'

data/lib/hiptest-publisher/gherkin_adder.rb

@@ -134,6 +134,7 @@ module Hiptest
         if actionword_parameters.has_key?(inline_parameter_name)
           actionword.chunks << {
             value: "(.*)",
+            name: inline_parameter_name,
             is_parameter: true
           }
         else
@@ -148,6 +149,7 @@ module Hiptest
       missing_parameter_names.each do |missing_parameter_name|
         actionword.extra_inlined_parameters << {
           value: "(.*)",
+          name: missing_parameter_name,
           is_parameter: true
         }
       end

data/lib/hiptest-publisher/options_parser.rb

@@ -199,7 +199,8 @@ class OptionsParser
       'SpecFlow' => [''],
       'Behave' => [''],
       'Behat' => [''],
-      'Groovy' => ['Spock']
+      'Groovy' => ['Spock'],
+      'JBehave' => ['']
     }
   end
 
@@ -237,6 +238,7 @@ class OptionsParser
       Option.new(nil, 'push-format=tap', 'tap', String, "Format of the test results (junit, nunit, tap, robot)", :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),
       Option.new(nil, 'keep-filenames', false, nil, "Keep the same name as in Hiptest for the test files (note: may cause encoding issues)", :keep_filenames),
       Option.new(nil, 'keep-foldernames', false, nil, "Keep the same name as in Hiptest for the folders (note: may cause encoding issues)", :keep_foldernames),
       Option.new(nil, 'filter-on-scenario-ids=IDS', '', String, "Filter on scenario ids (use commas to separate ids when fetching multiple scenarios)", :filter_on_scenario_ids),
@@ -561,7 +563,8 @@ class LanguageGroupConfig
       package: @language_group_params[:package],
       namespace: @language_group_params[:namespace],
       uids: @user_params[:uids],
-      renderer_addons: @language_group_params[:renderer_addons],
+      with_dataset_names: @user_params[:with_dataset_names],
+      renderer_addons: @language_group_params[:renderer_addons]
     )
   end
 

data/lib/hiptest-publisher/render_context_maker.rb

@@ -25,7 +25,9 @@ module Hiptest
     def walk_actionword(aw)
       walk_item(aw).merge(
         chunks: aw.chunks || [],
-        extra_inlined_parameters: aw.extra_inlined_parameters || []
+        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
       )
     end
 
@@ -63,6 +65,10 @@ module Hiptest
       }
     end
 
+    def walk_actionwords(aws)
+      {}
+    end
+
     def walk_test(test)
       {
         has_description?: !test.children[:description].nil? && !test.children[:description].empty?,

data/lib/hiptest-publisher/renderer_addons.rb

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

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

@@ -0,0 +1,23 @@
+require 'hiptest-publisher/nodes'
+
+module Hiptest
+  module BehaveAddon
+    def walk_actionwords(aws)
+      base = super(aws)
+      sorted_aws = aws.children[:actionwords]
+        .sort_by {|aw|
+          pattern = aw.children.fetch(:gherkin_pattern, "")
+          [pattern.length, pattern]
+        }.reverse
+
+      @rendered_children[:sorted_actionwords] = sorted_aws.map {|aw| @rendered[aw]}
+      return base
+    end
+
+    private
+
+    def get_pattern(aw)
+      name = aw.children["name"]
+    end
+  end
+end

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

@@ -2,7 +2,6 @@ require 'hiptest-publisher/nodes'
 
 module Hiptest
   module GroovySpockAddon
-
     def walk_call(call)
       base = super(call)
       base[:use_expect_annotation] = needs_fixing?(call)

data/lib/templates/behave/actionwords.hbs

@@ -7,6 +7,6 @@ from behave import *
 #     context.actionwords = Actionwords()
 
 use_step_matcher('re')
-{{#each rendered_children.actionwords}}
+{{#each rendered_children.sorted_actionwords}}
 {{{this}}}
 {{/each}}

data/lib/templates/gherkin/_scenario.hbs

@@ -5,7 +5,7 @@
 {{/if}}{{#each rendered_children.body}}{{{ this }}}
 {{/each}}
 Examples:{{#indent}}
-| {{ join rendered_children.parameters ' | ' }} |{{#if context.uids}} hiptest-uid |{{/if}}
+{{#if context.with_dataset_names}}| dataset name {{/if}}| {{ join rendered_children.parameters ' | ' }} |{{#if context.uids}} hiptest-uid |{{/if}}
 {{{rendered_children.datatable}}}
 {{/indent}}{{/indent}}
 {{else}}

data/lib/templates/gherkin/dataset.hbs

@@ -1 +1 @@
-| {{{ join_gherkin_dataset rendered_children.arguments }}} |{{#if context.uids}} {{#if rendered_children.test_snapshot_uid}}uid:{{{rendered_children.test_snapshot_uid}}}{{/if}} |{{/if}}
+{{#if context.with_dataset_names}}| {{rendered_children.name}} {{/if}}| {{{ join_gherkin_dataset rendered_children.arguments }}} |{{#if context.uids}} {{#if rendered_children.test_snapshot_uid}}uid:{{{rendered_children.test_snapshot_uid}}}{{/if}} |{{/if}}

data/lib/templates/jbehave/_scenario.hbs

@@ -0,0 +1,9 @@
+Scenario: {{{ rendered_children.name }}}{{#if context.uids}}{{#if rendered_children.uid}} (uid:{{{rendered_children.uid}}}){{/if}}{{/if}}
+{{#if has_tags?}}Meta:
+{{join rendered_children.tags ' '}}
+{{/if}}{{#if has_description?}}{{#comment '#'}}{{rendered_children.description}}{{/comment}}
+{{/if}}{{#each rendered_children.body}}{{{ this }}}
+{{/each}}{{#if has_datasets?}}
+Examples:
+{{#if context.with_dataset_names}}| dataset name {{/if}}| {{ join rendered_children.parameters ' | ' }} |{{#if context.uids}} hiptest-uid |{{/if}}
+{{{rendered_children.datatable}}}{{/if}}

data/lib/templates/jbehave/actionwords/parameter.hbs

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

data/lib/templates/jbehave/call.hbs

@@ -0,0 +1,5 @@
+{{> gherkin_text}}{{#if rendered_children.free_text_arg}}
+"""
+{{remove_surrounding_quotes rendered_children.free_text_arg }}
+"""{{/if}}{{#if rendered_children.datatable_arg}}
+{{remove_surrounding_quotes rendered_children.datatable_arg }}{{/if}}

data/lib/templates/jbehave/folder.hbs

@@ -0,0 +1,14 @@
+{{{ rendered_children.name }}}
+{{#if rendered_children.ancestor_tags}}Meta:
+{{rendered_children.ancestor_tags}}{{/if}}{{#if has_tags?}}{{#if rendered_children.ancestor_tags}} {{else}}Meta:
+{{/if}}{{join rendered_children.tags " "}}
+{{/if}}{{#if rendered_children.description}}
+Narrative:
+{{rendered_children.description}}{{/if}}
+{{#unless is_empty?}}
+Lifecycle:
+Before:
+Scope: SCENARIO
+{{#each rendered_children.body}}{{{ this }}}
+{{/each}}{{/unless}}{{#each rendered_children.scenarios}}
+{{{this}}}{{/each}}

data/lib/templates/jbehave/single_test.hbs

@@ -0,0 +1,3 @@
+Scenario: {{{ rendered_children.name }}}
+{{#each rendered_children.body}}{{{ this }}}
+{{/each}}

data/lib/templates/jbehave/steps/_gherkin_pattern.hbs

@@ -0,0 +1 @@
+{{#strip}}{{#join chunks '"'}}{{#if this.is_parameter}}${{this.name}}{{else}}{{this.value}}{{/if}}{{/join}}{{#each extra_inlined_parameters}} "${{this.name}}"{{/each}}{{/strip}}{{#if has_free_text_parameter?}} """$freeText"""{{/if}}{{#if has_datatable_parameter?}} $datatable{{/if}}

data/lib/templates/jbehave/steps/actionword.hbs

@@ -0,0 +1,6 @@
+{{#if rendered_children.gherkin_annotation }}@{{{ rendered_children.gherkin_annotation }}}("{{#escape_backslashes_and_double_quotes}}{{> gherkin_pattern}}{{/escape_backslashes_and_double_quotes}}")
+public void {{{camelize_lower rendered_children.name}}}({{{ join rendered_children.parameters_ordered_by_pattern ', '}}}) {{#curly}}{{#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/jbehave/steps/actionwords.hbs

@@ -0,0 +1,18 @@
+package {{{ context.package }}};
+
+import org.jbehave.core.annotations.*;
+import org.jbehave.core.model.ExamplesTable;
+
+public class StepDefinitions {{#curly}}{{#indent}}
+public Actionwords {{{ context.call_prefix }}};
+
+@BeforeScenario
+public void beforeEachScenario() {{#curly}}{{#indent}}
+actionwords = new Actionwords();
+{{/indent}}
+{{/curly}}
+
+{{#each rendered_children.actionwords}}{{{this}}}
+{{/each}}
+{{/indent}}
+{{/curly}}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiptest-publisher
 version: !ruby/object:Gem::Version
-  version: 1.11.1
+  version: 1.12.0
 platform: ruby
 authors:
 - Hiptest R&D
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-18 00:00:00.000000000 Z
+date: 2018-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -239,6 +239,7 @@ files:
 - lib/config/javascript-mocha.conf
 - lib/config/javascript-protractor.conf
 - lib/config/javascript-qunit.conf
+- lib/config/jbehave.conf
 - lib/config/php-phpunit.conf
 - lib/config/python-unittest.conf
 - lib/config/robotframework.conf
@@ -268,6 +269,7 @@ files:
 - lib/hiptest-publisher/render_context_maker.rb
 - lib/hiptest-publisher/renderer.rb
 - lib/hiptest-publisher/renderer_addons.rb
+- lib/hiptest-publisher/renderer_addons/behave_addon.rb
 - lib/hiptest-publisher/renderer_addons/groovy_spock_addon.rb
 - lib/hiptest-publisher/signature_differ.rb
 - lib/hiptest-publisher/signature_exporter.rb
@@ -467,6 +469,14 @@ files:
 - lib/templates/javascript/test.hbs
 - lib/templates/javascript/tests.hbs
 - lib/templates/javascript/while.hbs
+- lib/templates/jbehave/_scenario.hbs
+- lib/templates/jbehave/actionwords/parameter.hbs
+- lib/templates/jbehave/call.hbs
+- lib/templates/jbehave/folder.hbs
+- lib/templates/jbehave/single_test.hbs
+- lib/templates/jbehave/steps/_gherkin_pattern.hbs
+- lib/templates/jbehave/steps/actionword.hbs
+- lib/templates/jbehave/steps/actionwords.hbs
 - lib/templates/php/_body.hbs
 - lib/templates/php/_item_as_function.hbs
 - lib/templates/php/_scenario.hbs
@@ -630,7 +640,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Export your tests from Hiptest into executable tests.