hiptest-publisher 0.20.0 → 0.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8be16d9ad9975911593e440094b5493c38370870
-  data.tar.gz: 233ff80ce6528326b565f8cbf799b0fbd7839507
+  metadata.gz: 557ac265f72b34acfdb249d8dc9b19b62e95ad94
+  data.tar.gz: 22832b872d9d72f0cd6614079dd41b308507cc46
 SHA512:
-  metadata.gz: ca2d5fbc8cc85e4dafd7b19e0b8399a686aec32269d460b304037eea9d9868a9879526c2a97958177c335a3a5d58908488f415c204ffd69f42807178cc16b389
-  data.tar.gz: b56d092ec517cc1e23a0e6df5c7af0d54fb1b42af551225621072a58a5e0cde7c2229bf224ccb2703f760de49c08d3100189ce42afa00ceb2d1f8a6457de1f9e
+  metadata.gz: e29f1545e47dcffaa22e963cbc61ff7206df9b6c4067aa7f3d572a4919c4509d865143d6cbe5012276ac5f1760722dc89878ced9e37bcfecf6792ebb839c1ad9
+  data.tar.gz: de62becd1694f97347c3cab7068000a881a24f41db810267c2df025657ddba475f4b4d3447429f289078b9333399f38cbb74639eb8b544bf621233a1d86fa605

data/lib/config/javascript-protractor.conf

@@ -1,5 +1,5 @@
 [_common]
-template_dirs = javascript/jasmine, javascript, common
+template_dirs = javascript/mocha, javascript, common
 
 [tests]
 filename = 'project_test.js'

data/lib/hiptest-publisher/nodes.rb

@@ -255,6 +255,10 @@ module Hiptest
         super()
         @children = {:key => key, :value => value}
       end
+
+      def to_s
+        "#{@children[:key]}#{@children[:value].nil? ? '' : ':' + @children[:value]}"
+      end
     end
 
     class Parameter < Node
@@ -301,6 +305,17 @@ module Hiptest
           p_names.include?(v_name) ? nil : v_name
         end.uniq.compact
       end
+
+      def add_tags(tags)
+        existing = @children[:tags].map(&:to_s)
+
+        tags.each do |tag|
+          next if existing.include? tag.to_s
+
+          existing << tag.to_s
+          @children[:tags] << tag
+        end
+      end
     end
 
     class Actionword < Item

data/lib/hiptest-publisher/xml_parser.rb

@@ -225,6 +225,8 @@ module Hiptest
       scenario = build_scenario(scs)
       datasets = scenario.each_sub_nodes(Hiptest::Nodes::Dataset).to_a
 
+      scenario.add_tags(scs.css('testSnapshot').flat_map { |test| build_tags(test)}.compact)
+
       if datasets.empty?
         scenario.set_uid(css_first_content(scs, 'testSnapshot > uid'))
       else

data/lib/templates/robotframework/folder.hbs

@@ -2,9 +2,9 @@
 Documentation
 {{#comment '... '}}{{#clear_empty_lines}}
 {{{ rendered_children.description}}}
-{{#if has_tags?}}
-Tags: {{{ join rendered_children.tags ' '}}}
-{{/if}}{{/clear_empty_lines}}{{/comment}}
+{{/clear_empty_lines}}{{/comment}}{{#if has_tags?}}
+Default Tags {{{ join rendered_children.tags ' '}}}
+{{/if}}
 Resource          keywords.txt
 {{#unless is_empty?}}
 Test Setup{{tab}}Run Keywords{{tab}}{{join rendered_children.body "\n...         AND      \t"}}

data/lib/templates/robotframework/scenarios.hbs

@@ -6,17 +6,19 @@ Resource          keywords.txt
 {{#if this.datatable}}{{this.name}}{{#indent}}
 [Template]{{tab}}{{this.name}} keyword
 {{this.datatable}}{{/indent}}
-{{else}}{{normalize_with_spaces this.name}}{{#if rendered_children.uid}} (uid:{{normalize rendered_children.uid}}){{/if}}{{#indent}}
-{{join this.body '\n'}}{{/indent}}
+{{else}}{{normalize_with_spaces this.name}}{{#if this.uid}} (uid:{{normalize this.uid}}){{/if}}{{#indent}}{{#if this.tags}}
+[Tags] {{{ join this.tags ' '}}}
+{{/if}}{{join this.body '\n'}}{{/indent}}
 {{/if}}{{/each}}
 *** Keywords ***
 
 {{#each rendered_children.splitted_scenarios}}{{#if this.datatable}}{{normalize_with_spaces this.name}} keyword{{#indent}}
 [Arguments]{{tab}}${{#curly}}__test_name{{/curly}}{{tab}}{{join this.parameters '\t'}}
-{{join this.body '\n'}}{{/indent}}
+{{#if this.tags}}[Tags] {{{ join this.tags ' '}}}
+{{/if}}{{join this.body '\n'}}{{/indent}}
 
 {{/if}}{{/each}}{{else}}
 {{#each rendered_children.splitted_scenarios}}
-{{normalize_with_spaces this.name}}{{#if rendered_children.uid}} (uid:{{normalize rendered_children.uid}}){{/if}}{{#indent}}
+{{normalize_with_spaces this.name}}{{#if this.uid}} (uid:{{normalize this.uid}}){{/if}}{{#indent}}
 {{join this.body '\n'}}{{/indent}}
 {{/each}}{{/if}}

data/lib/templates/robotframework/single_scenario.hbs

@@ -2,9 +2,8 @@
 Documentation
 {{#comment '... '}}{{#clear_empty_lines}}
 {{{ rendered_children.description}}}
-{{#if has_tags?}}
-Tags: {{{ join rendered_children.tags ' '}}}
-{{/if}}{{/clear_empty_lines}}{{/comment}}
+{{/clear_empty_lines}}{{/comment}}{{#if has_tags?}}
+Default Tags {{{ join rendered_children.tags ' '}}}{{/if}}
 
 Resource          keywords.txt
 

data/lib/templates/robotframework/single_test.hbs

@@ -2,9 +2,8 @@
 Documentation
 {{#comment '... '}}{{#clear_empty_lines}}
 {{{ rendered_children.description}}}
-{{#if has_tags?}}
-Tags: {{{ join rendered_children.tags ' '}}}
-{{/if}}{{/clear_empty_lines}}{{/comment}}
+{{/clear_empty_lines}}{{/comment}}{{#if has_tags?}}
+Default Tags {{{ join rendered_children.tags ' '}}}{{/if}}
 
 Resource          keywords.txt
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiptest-publisher
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.20.1
 platform: ruby
 authors:
 - Hiptest R&D