hiptest-publisher 0.11.2 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92481eaaef2c39f506eef927d55614e9128bdb64
-  data.tar.gz: c775ba60cfaf9df6ede265cd76c2bec9c45a7311
+  metadata.gz: aaf797bb90915b33c0fcc31a91db0b9c08fc0719
+  data.tar.gz: 5c9da89ee5917ae6dafd57b327489adb97f235b8
 SHA512:
-  metadata.gz: b6588cc807d448c99215f35d57d814e85d5f528c257cfc15f0106ac9070fbdbf2d2fdf9a0fa120ebeabd1a5a5639b1e46e3f20b82a666a56e508d2864728e5e9
-  data.tar.gz: 976e868e9a867fc48406a38ebf7b50b8639cfa1a41b0e110c6209457d038559e04a05a39e1fe83f7e8baddee6025f1e0c5b08ba83be4728471a0bc8afbe029e8
+  metadata.gz: 484a6f05e90199d760a72ecb04b7afb65d604eb4a2d9e9bcd8caf89f1288868b7654303ace2e55467ecf1b6580139f5519980bda54d82112b27b4c6bee2058e0
+  data.tar.gz: b9aa082407bacefdc575d59129ad50a21ed915311f4cad50710dbe05fce5aa6dad38d9dd74591eedeffe5c429af8f91adfe5c727e297bee333ea357e9fad1f93

data/README.md

@@ -95,7 +95,7 @@ Specific options:
         --leafless-export            Use only last level action word (default: false)
     -s, --site=SITE                  Site to fetch from (default: https://hiptest.net)
     -p, --push=FILE.TAP              Push a results file to the server
-        --push-format=tap            Format of the test results (tap, junit, robot) (default: tap)
+        --push-format=tap            Format of the test results (tap, junit, nunit, 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)
     -v, --verbose                    Run verbosely (default: false)
     -H, --languages-help             Show languages and framework options
@@ -132,12 +132,13 @@ Posting results to Hiptest
 --------------------------
 
 You can use the options --push to push the results back to Hiptest. For this, you first need to generate the test code from a Test run by specifying option ``--test-run-id=<xxx>`` during code generation (or add it to the configuration file).
-The tests must then generate a test report that is supported by Hiptest. Currently three types of test results are handled:
+The tests must then generate a test report that is supported by Hiptest. Currently four types of test results are handled:
  - tap (Test Anything Protocol)
- - jUnit XML style
+ - jUnit XML format
+ - NUnit XML format
  - Robot framework XML output
 
-You can specify the type of export when pushing by using the option "--push-format=[tap|junit|robot]" or specifying it in the config file.
+You can specify the type of export when pushing by using the option "--push-format=[tap|junit|nunit|robot]" 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/hiptest-publisher.rb

@@ -1,4 +1,5 @@
 require 'colorize'
+require 'fileutils'
 require 'json'
 require 'yaml'
 
@@ -159,17 +160,7 @@ module Hiptest
       end
 
       if @cli_options.aw_created
-        return if diff[:created].nil?
-
-        @language_config.language_group_configs.select { |language_group_config|
-          language_group_config[:group_name] == "actionwords"
-        }.each do |language_group_config|
-          diff[:created].each do |created|
-            node_rendering_context = language_group_config.build_node_rendering_context(created[:node])
-            puts node_rendering_context[:node].render(node_rendering_context)
-            puts ""
-          end
-        end
+        print_updated_aws(diff[:created])
         return
       end
 
@@ -183,17 +174,12 @@ module Hiptest
       end
 
       if @cli_options.aw_signature_changed
-        return if diff[:signature_changed].nil?
+        print_updated_aws(diff[:signature_changed])
+        return
+      end
 
-        @language_config.language_group_configs.select { |language_group_config|
-          language_group_config[:group_name] == "actionwords"
-        }.each do |language_group_config|
-          diff[:signature_changed].each do |signature_changed|
-            node_rendering_context = language_group_config.build_node_rendering_context(signature_changed[:node])
-            puts signature_changed[:node].render(node_rendering_context)
-            puts ""
-          end
-        end
+      if @cli_options.aw_definition_changed
+        print_updated_aws(diff[:definition_changed])
         return
       end
 
@@ -221,6 +207,12 @@ module Hiptest
         puts ""
       end
 
+      unless diff[:definition_changed].nil?
+        puts "#{pluralize(diff[:definition_changed].length, "action word")} which definition changed:"
+        puts diff[:definition_changed].map {|c| "- #{c[:name]}"}.join("\n")
+        puts ""
+      end
+
       if diff.empty?
         puts "No action words changed"
         puts ""
@@ -229,6 +221,21 @@ module Hiptest
       reporter.dump_error(err)
     end
 
+    def print_updated_aws(actionwords)
+        return if actionwords.nil?
+
+        @language_config.language_group_configs.select { |language_group_config|
+          language_group_config[:group_name] == "actionwords"
+        }.each do |language_group_config|
+          actionwords.each do |actionword|
+            node_rendering_context = language_group_config.build_node_rendering_context(actionword[:node])
+            puts actionword[:node].render(node_rendering_context)
+            puts ""
+          end
+        end
+        return
+    end
+
     def export
       return if @project.nil?
 

data/lib/hiptest-publisher/handlebars_helper.rb

@@ -70,6 +70,15 @@ module Hiptest
       end
     end
 
+    def hh_with(context, var, name, block)
+      name = name.to_s
+      current_value = context.get(name)
+      context.add_item(name, var)
+      result = block.fn(context)
+      context.add_item(name, current_value)
+      result
+    end
+
     def hh_unless(context, condition, block, else_block = nil)
       condition = !condition.empty? if condition.respond_to?(:empty?)
 

data/lib/hiptest-publisher/nodes.rb

@@ -69,11 +69,26 @@ module Hiptest
         end
       end
 
+      def flat_string
+        flat_childs = children.map do |key, value|
+          "#{key}: #{flatten_child(value)}"
+        end.join(", ")
+        "<#{self.class.name} [#{flat_childs}]>"
+      end
+
       private
 
       def node_kinds
         @@node_kinds ||= {}
       end
+
+      def flatten_child(child)
+        return child.flat_string if child.is_a?(Node)
+        if child.is_a?(Array)
+          return child.map {|item| flatten_child(item)}
+        end
+        child.to_s
+      end
     end
 
     class Literal < Node

data/lib/hiptest-publisher/options_parser.rb

@@ -73,7 +73,7 @@ class CliOptions < OpenStruct
   end
 
   def actionwords_diff?
-    actionwords_diff || aw_deleted || aw_created || aw_renamed || aw_signature_changed
+    actionwords_diff || aw_deleted || aw_created || aw_renamed || aw_signature_changed || aw_definition_changed
   end
 
   def language_framework
@@ -160,12 +160,13 @@ class OptionsParser
       Option.new(nil, 'show-actionwords-created', false, nil, "Output code for new action words", :aw_created),
       Option.new(nil, 'show-actionwords-renamed', false, nil, "Output signatures of renamed action words", :aw_renamed),
       Option.new(nil, 'show-actionwords-signature-changed', false, nil, "Output signatures of action words for which signature changed", :aw_signature_changed),
+      Option.new(nil, 'show-actionwords-definition-changed', false, nil, "Output action words for which definition changed", :aw_definition_changed),
       Option.new(nil, 'with-folders', false, nil, "Use folders hierarchy to export files in respective directories", :with_folders),
       Option.new(nil, 'split-scenarios', false, nil, "Export each scenario in a single file", :split_scenarios),
       Option.new(nil, 'leafless-export', false, nil, "Use only last level action word", :leafless_export),
       Option.new('s', 'site=SITE', 'https://hiptest.net', String, "Site to fetch from", :site),
       Option.new('p', 'push=FILE.TAP', '', String, "Push a results file to the server", :push),
-      Option.new(nil, 'push-format=tap', 'tap', String, "Format of the test results (tap, junit, robot)", :push_format),
+      Option.new(nil, 'push-format=tap', 'tap', String, "Format of the test results (tap, junit, nunit, 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('v', 'verbose', false, nil, "Run verbosely", :verbose)
     ]

data/lib/hiptest-publisher/renderer.rb

@@ -33,6 +33,7 @@ module Hiptest
           @rendered_children[:splitted_scenarios] = node.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|

data/lib/hiptest-publisher/signature_differ.rb

@@ -17,12 +17,14 @@ module Hiptest
       compute_deleted
       compute_renamed
       compute_signature_changed
+      compute_definition_changed
 
       diff = {}
       diff[:created] = @created unless @created.empty?
       diff[:deleted] = @deleted unless @deleted.empty?
       diff[:renamed] = @renamed unless @renamed.empty?
       diff[:signature_changed] = @signature_changed unless @signature_changed.empty?
+      diff[:definition_changed] = @definition_changed unless @definition_changed.empty?
 
       diff
     end
@@ -57,6 +59,16 @@ module Hiptest
       end.compact
     end
 
+    def compute_definition_changed
+      @definition_changed = @current_uid.map do |uid, aw|
+        next if @old_uid[uid].nil?
+        next unless @old_uid[uid].has_key?('body_hash')
+        next if aw['body_hash'] == @old_uid[uid]['body_hash']
+
+        {name: aw['name'], node: aw['node']}
+      end.compact
+    end
+
     def map_by_uid(actionwords)
       Hash[actionwords.collect { |aw| [aw['uid'], aw] }]
     end

data/lib/hiptest-publisher/signature_exporter.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'digest/md5'
 
 module Hiptest
   class SignatureExporter
@@ -15,7 +16,8 @@ module Hiptest
       hash = {
         'name' => item.children[:name],
         'uid' => item.children[:uid],
-        'parameters' => export_parameters(item)
+        'parameters' => export_parameters(item),
+        'body_hash' => make_body_hash(item.children[:body])
       }
       hash['node'] = item if export_node
       hash
@@ -32,5 +34,9 @@ module Hiptest
         'name' => parameter.children[:name]
       }
     end
+
+    def make_body_hash(body)
+      Digest::MD5.hexdigest(body.map(&:flat_string).join(''))
+    end
   end
 end

data/lib/hiptest-publisher/xml_parser.rb

@@ -219,6 +219,8 @@ module Hiptest
       if datasets.empty?
         scenario.set_uid(css_first_content(scs, 'testSnapshot > uid'))
       else
+        scenario.set_uid(css_first_content(scs, ' > uid'))
+
         scs.css('testSnapshot').each do |testSnapshot|
           uid = css_first_content(testSnapshot, '> uid')
           index = css_first_content(testSnapshot, '> index').to_i

data/lib/templates/gherkin/single_scenario.hbs

@@ -1,6 +1,6 @@
 {{#if has_datasets?}}
 {{#if has_tags?}}{{join rendered_children.tags ' '}}
-{{/if}}Scenario Outline: {{{ rendered_children.name }}}{{#indent}}
+{{/if}}Scenario Outline: {{{ rendered_children.name }}}{{#if rendered_children.uid}} (uid:{{{rendered_children.uid}}}){{/if}}{{#indent}}
 {{#each rendered_children.body}}{{{ this }}}
 {{/each}}
 Examples:{{#indent}}

data/lib/templates/robotframework/folder.hbs

@@ -10,15 +10,17 @@ Resource          keywords.txt
 Test Setup{{tab}}Run Keywords{{tab}}{{join rendered_children.body "\n...         AND      \t"}}
 {{/unless}}
 *** Test Cases ***{{#if datatables_present?}}
-{{#each rendered_children.splitted_scenarios}}
+{{#each rendered_children.splitted_scenarios}}{{#with this.tags "tags"}}
 {{#if this.datatable}}{{#each this.datasets}}{{normalize_with_spaces this.scenario_name}} {{normalize_with_spaces this.name}}{{#if this.uid}} (uid:{{normalize this.uid}}){{/if}}{{#indent}}
-[Template]{{tab}}{{normalize_with_spaces this.scenario_name}} keyword
+{{#if tags}}[Tags]{{tab}}{{{join tags "\t"}}}
+{{/if}}[Template]{{tab}}{{normalize_with_spaces this.scenario_name}} keyword
 {{join this.arguments '\t'}}{{/indent}}
 
 {{/each}}
 {{else}}{{normalize_with_spaces this.name}}{{#if this.uid}}(uid:{{normalize this.uid}}){{/if}}{{#indent}}
-{{join this.body '\n'}}{{/indent}}
-{{/if}}{{/each}}
+{{#if this.tags}}[Tags]{{tab}}{{{join this.tags "\t"}}}
+{{/if}}{{join this.body '\n'}}{{/indent}}
+{{/if}}{{/with}}{{/each}}
 *** Keywords ***
 
 {{#each rendered_children.splitted_scenarios}}{{#if this.datatable}}{{normalize_with_spaces this.name}} keyword{{#indent}}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiptest-publisher
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0
 platform: ruby
 authors:
 - Hiptest R&D
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize