hiptest-publisher 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9265f5d7fb656ed28ee0fa1c09a38538741bf11e
-  data.tar.gz: 5888104486e35517396d17456b8cadc8d512803d
+  metadata.gz: be4a3b2d0bbf17ed7a2af2d6d5046741f7409132
+  data.tar.gz: 978b02362aaf8f9044aab395f52e36b6639eb9bb
 SHA512:
-  metadata.gz: 7e818f3e3ebfc105196dba8c74b7df0cb10943eb1919b9cd8385cfb5978e4670198703204aa61433ddf1a17bd4a91e473485e25891683a9219a3ad773b90c9c2
-  data.tar.gz: ead810b664042eb7a98fab859bc574c92ca0b27e211d9c8b83271461b365e2810bfeccfe84fed6db697d35c6c41ea81d5a50accc278474a8ab00703c91c0dde7
+  metadata.gz: aeb755943f4b5e5d3edd6a2449d782de32622dd7d4e233f6723cb5c90bd09a4f051bb1b3122ef16fa0bc969758d65fdf8e2c551f6dee4a6e08d51a504c35b834
+  data.tar.gz: 66d01375e139672cfc2976fc67273128e89690beb703e6e8f2692729ed2cdb454768134a1dadeea9c0d70e8bc2306f7a3445377b9a48414d1298699a06ae5976

data/lib/config/robotframework.conf

@@ -3,6 +3,7 @@ template_dirs = robotframework, python, common
 indentation = "\t"
 
 [tests]
+filename = 'test_project.txt'
 named_filename = 'test_%s.txt'
 filename_convention = 'underscore'
 

data/lib/hiptest-publisher/handlebars_helper.rb

@@ -17,6 +17,7 @@ module Hiptest
         :normalize,
         :normalize_lower,
         :normalize_with_dashes,
+        :normalize_with_spaces,
         :underscore,
         :camelize,
         :camelize_lower,
@@ -46,7 +47,10 @@ module Hiptest
     end
 
     def hh_join(context, items, joiner, block, else_block = nil)
-      joiner = "\t" if joiner == '\t'
+      joiner = joiner.to_s
+      joiner.gsub!(/\\t/, "\t")
+      joiner.gsub!(/\\n/, "\n")
+
 
       if block.nil? || block.items.empty?
         "#{items.join(joiner)}"
@@ -78,17 +82,21 @@ module Hiptest
       end
     end
 
-    def hh_indent(context, block)
-      indentation = @context[:indentation] || '  '
-      indentation = "\t" if indentation == '\t'
-
+    def hh_prepend(context, str, block)
       block.fn(context).split("\n").map do |line|
-        indented = "#{indentation}#{line}"
+        indented = "#{str}#{line}"
         indented = "" if indented.strip.empty?
         indented
       end.join("\n")
     end
 
+    def hh_indent(context, block)
+      indentation = @context[:indentation] || '  '
+      indentation = "\t" if indentation == '\t'
+
+      hh_prepend(context, indentation, block)
+    end
+
     def hh_clear_empty_lines(context, block)
       block.fn(context).split("\n").map do |line|
         line unless line.strip.empty?

data/lib/hiptest-publisher/render_context_maker.rb

@@ -28,15 +28,15 @@ module Hiptest
         :self_name => folder.children[:name],
         :has_tags? => !folder.children[:tags].empty?,
         :has_step? => has_step?(folder),
-        :is_empty? => folder.children[:body].empty?
+        :is_empty? => folder.children[:body].empty?,
+        :datatables_present? => datatable_present?(folder),
       )
     end
 
     def walk_scenario(scenario)
-      datatable = scenario.children[:datatable]
       walk_item(scenario).merge(walk_relative_item(scenario)).merge(
         :project_name => scenario.parent.parent.children[:name],
-        :has_datasets? => datatable ? !datatable.children[:datasets].empty? : false
+        :has_datasets? => has_datasets?(scenario)
       )
     end
 
@@ -52,6 +52,7 @@ module Hiptest
       {
         :project_name => project.children[:name],
         :self_name => project.children[:name],
+        :datatables_present? => datatable_present?(scenarios)
       }
     end
 
@@ -71,7 +72,7 @@ module Hiptest
       project = tests.parent
       {
         :project_name => project.children[:name],
-        :self_name => project.children[:name],
+        :self_name => project.children[:name]
       }
     end
 
@@ -123,5 +124,23 @@ module Hiptest
       end
       false
     end
+
+    def has_datasets?(scenario)
+      datatable = scenario.children[:datatable]
+      datatable ? !datatable.children[:datasets].empty? : false
+    end
+
+    def datatable_present?(container)
+      datatables_present = false
+
+      container.children[:scenarios].each do |scenario|
+        if has_datasets?(scenario)
+          datatables_present = true
+          break
+        end
+      end
+
+      return datatables_present
+    end
   end
 end

data/lib/hiptest-publisher/renderer.rb

@@ -25,6 +25,22 @@ module Hiptest
     def call_node_walker(node)
       if node.is_a? Hiptest::Nodes::Node
         @rendered_children = {}
+
+        if node.is_a?(Hiptest::Nodes::Folder) || node.is_a?(Hiptest::Nodes::Scenarios)
+          # For Robot framework, we need direct access to every scenario
+          # datatables and body rendered ....
+
+          @rendered_children[:splitted_scenarios] = node.children[:scenarios].map {|sc| 
+            {
+              name: @rendered[sc.children[:name]],
+              uid: @rendered[sc.children[:uid]],
+              datatable: @rendered[sc.children[:datatable]],
+              parameters:  @rendered[sc.children[:parameters]],
+              body: @rendered[sc.children[:body]]
+            }
+          }
+        end
+
         node.children.each {|name, child| @rendered_children[name] = @rendered[child]}
         @rendered[node] = render_node(node, super(node))
       elsif node.is_a? Array

data/lib/hiptest-publisher/string.rb

@@ -8,14 +8,20 @@ class String
     I18n.transliterate(self)
   end
 
-  def normalize(keep_dashes=false)
+  def normalize(keep_dashes=false, keep_spaces=false)
     literated = self.literate
     literated.strip!
-    literated.gsub!(/\s+/, '_')
-    if keep_dashes
-      literated.gsub!(/[^a-zA-Z0-9_\-]/, '')
+
+    if keep_spaces
+      literated.gsub!(/\s+/, ' ')
+      literated.gsub!(/[^a-zA-Z0-9_\- "']/, '')
     else
-      literated.gsub!(/\W/, '')
+      literated.gsub!(/\s+/, '_')
+      if keep_dashes
+        literated.gsub!(/[^a-zA-Z0-9_\-]/, '')
+      else
+        literated.gsub!(/\W/, '')
+      end
     end
     literated
   end
@@ -30,6 +36,10 @@ class String
     self.normalize(true)
   end
 
+  def normalize_with_spaces
+    self.normalize(false, true)
+  end
+
   def underscore
     # based on:
     # http://stackoverflow.com/questions/1509915/converting-camel-case-to-underscore-case-in-ruby

data/lib/templates/robotframework/_scenario.hbs

@@ -1,5 +1,5 @@
 {{#if has_datasets?}}
-Test Template     {{{ underscore rendered_children.name }}}
+Test Template     {{{ normalize_with_spaces rendered_children.name }}}
 
 *** Test Cases ***{{#each node.children.parameters}}{{{ tab }}}{{{ this.children.name}}}{{/each}}
 {{{ rendered_children.datatable }}}
@@ -8,4 +8,4 @@ Test Template     {{{ underscore rendered_children.name }}}
 {{else}}
 *** Test Cases ***
 {{/if}}
-{{> keyword}}
+{{{normalize_with_spaces rendered_children.name }}}{{#if rendered_children.uid}} (uid:{{normalize rendered_children.uid}}){{/if}}{{> keyword_body}}

data/lib/templates/robotframework/call.hbs

@@ -1,2 +1 @@
-{{#if has_annotation? }}{{#comment '#'}}{{{ rendered_children.gherkin_text }}}{{/comment}}
-{{/if}}{{{ underscore rendered_children.actionword }}}{{#if has_arguments?}}{{tab}}{{{ join rendered_children.arguments '\t'}}}{{/if}}
+{{{ underscore rendered_children.actionword }}}{{#if has_arguments?}}{{tab}}{{{ join rendered_children.arguments '\t'}}}{{/if}}

data/lib/templates/robotframework/folder.hbs

@@ -1 +1,30 @@
-PLEASE USE THE --split-scenarios OPTION WHEN PUBLISHING
+*** Settings ***
+Documentation
+{{#comment '... '}}{{#clear_empty_lines}}
+{{{ rendered_children.description}}}
+{{#if has_tags?}}
+Tags: {{{ join rendered_children.tags ' '}}}
+{{/if}}{{/clear_empty_lines}}{{/comment}}
+Resource          keywords.txt
+{{#unless is_empty?}}
+Test Setup{{tab}}Run Keywords{{tab}}{{join rendered_children.body "\n...         AND      \t"}}
+{{/unless}}
+*** Test Cases ***{{#if datatables_present?}}
+{{#each rendered_children.splitted_scenarios}}
+{{#if this.datatable}}{{normalize_with_spaces this.name}}{{#indent}}
+[Template]{{tab}}{{normalize_with_spaces this.name}} keyword
+{{this.datatable}}{{/indent}}
+{{else}}{{normalize_with_spaces this.name}}{{#if this.uid}}(uid:{{normalize this.uid}}){{/if}}{{#indent}}
+{{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}}{{/each}}{{else}}
+{{#each rendered_children.splitted_scenarios}}
+{{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/scenarios.hbs

@@ -1 +1,22 @@
-PLEASE USE THE --split-scenarios OPTION WHEN PUBLISHING
+*** Settings ***
+Resource          keywords.txt
+
+*** Test Cases ***{{#if datatables_present?}}
+{{#each rendered_children.splitted_scenarios}}
+{{#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}}
+{{/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}}{{/each}}{{else}}
+{{#each rendered_children.splitted_scenarios}}
+{{normalize_with_spaces this.name}}{{#if rendered_children.uid}} (uid:{{normalize rendered_children.uid}}){{/if}}{{#indent}}
+{{join this.body '\n'}}{{/indent}}
+{{/each}}{{/if}}

data/lib/templates/robotframework/test.hbs

@@ -0,0 +1 @@
+{{{normalize_with_spaces rendered_children.name }}}{{#if rendered_children.uid}}_uid{{{ normalize rendered_children.uid}}}{{/if}}{{> keyword_body}}

data/lib/templates/robotframework/tests.hbs

@@ -1 +1,7 @@
-PLEASE USE THE --split-scenarios OPTION WHEN PUBLISHING
+*** Settings ***
+Resource          keywords.txt
+
+*** Test Cases ***
+{{#each rendered_children.tests}}
+{{this}}
+{{/each}}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiptest-publisher
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Hiptest R&D
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-22 00:00:00.000000000 Z
+date: 2016-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -516,6 +516,7 @@ files:
 - lib/templates/robotframework/single_test.hbs
 - lib/templates/robotframework/stringliteral.hbs
 - lib/templates/robotframework/template.hbs
+- lib/templates/robotframework/test.hbs
 - lib/templates/robotframework/tests.hbs
 - lib/templates/robotframework/variable.hbs
 - lib/templates/robotframework/while.hbs