hiptest-publisher 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f973be3f512aeaeb602fff2b338128ac378d828
-  data.tar.gz: 0653c5dde8296c14f9afe566fcc1da3933db8b21
+  metadata.gz: 1365193e277e18365cb7ec5f3ac84a85278bf146
+  data.tar.gz: ee10d2cb7cb653d584b977707c9b2f21c5a3d0df
 SHA512:
-  metadata.gz: ef37dddc970dec19e192b487c303eec3aea2103fdc1071798032dafb5b825b52b11f33cbeafab94135cfa1a4ef22e0ce3a06a24a3c1d7ba011892aa14613a5b2
-  data.tar.gz: 24b25a7bb65b627a44dfa5683badd3186b12d734f034c5f3a9062f774a4a280ae8bb22190cfa10a988c7d02da5a555330ab004ded65f929083b797bc55f90074
+  metadata.gz: 78a77f1e1b26735f6354f375664c16ff904525645e2e0a75260370374c1121ec26e24c26732d6c99e601356dc0b8eeffdad2c69c410eb27c42c23e4fb4087c7b
+  data.tar.gz: 65a608b932517c94b4da199d209887ae4bea55d6a19745087bbc0db3ab90be303780dd794bb5a462d1b636b77d4febe68631598a6dab68a17b5a8b1725d08b31

data/lib/hiptest-publisher/handlebars_helper.rb

@@ -135,6 +135,11 @@ module Hiptest
       s ? s.gsub('"', '\\"') : ""
     end
 
+    def hh_escape_single_quotes (context, s, block)
+      # weird \\\\, see http://stackoverflow.com/questions/7074337/why-does-stringgsub-double-content
+      s ? s.gsub('\'', "\\\\'") : ""
+    end
+
     def hh_escape_backslashes_and_double_quotes (context, s, block)
       if s
         s.gsub('\\') { |c| c*2 }.
@@ -144,9 +149,20 @@ module Hiptest
       end
     end
 
-    def hh_escape_single_quotes (context, s, block)
-      # weird \\\\, see http://stackoverflow.com/questions/7074337/why-does-stringgsub-double-content
-      s ? s.gsub('\'', "\\\\'") : ""
+    def hh_escape_new_line(context, s, block = nil)
+      if s.is_a? Handlebars::Tree::Block
+        s = s.fn(context)
+      end
+
+      s.gsub("\n", '\\n')
+    end
+
+    def hh_remove_surrounding_quotes(context, s, block = nil)
+      if s.is_a? Handlebars::Tree::Block
+        s = s.fn(context)
+      end
+
+      s.gsub(/^("|')|("|')$/, '')
     end
 
     def hh_comment (context, commenter, block)

data/lib/hiptest-publisher/renderer.rb

@@ -22,34 +22,33 @@ module Hiptest
       @template_finder = context.template_finder
     end
 
+    def walk_call(call)
+      # For Gherkin, we need the __free_text argument rendered.
+      free_text_arg = call.children[:arguments].select do |arg|
+        arg.children[:name] == '__free_text'
+      end.first
+
+      unless free_text_arg.nil?
+        @rendered_children[:free_text_arg] = @rendered[free_text_arg.children[:value]]
+      end
+
+      super(call)
+    end
+
+    def walk_scenarios(scs)
+      walk_scenario_container(scs)
+      super(scs)
+    end
+
+    def walk_folder(folder)
+      walk_scenario_container(folder)
+      super(folder)
+    end
+
     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]],
-              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]],
-                  arguments: @rendered[dataset.children[:arguments]]
-                }
-              },
-              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
@@ -67,5 +66,31 @@ module Hiptest
 
       @template_finder.get_compiled_handlebars(node.kind).call(render_context)
     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]],
+              arguments: @rendered[dataset.children[:arguments]]
+            }
+          },
+          parameters:  @rendered[sc.children[:parameters]],
+          body: @rendered[sc.children[:body]]
+        }
+      }
+    end
   end
 end

data/lib/templates/csharp/argument.hbs

@@ -1 +1 @@
-{{{ rendered_children.value }}}
+{{{escape_new_line rendered_children.value }}}

data/lib/templates/gherkin/call.hbs

@@ -1 +1,4 @@
-{{{ rendered_children.gherkin_text }}}
+{{{ rendered_children.gherkin_text }}}{{#if rendered_children.free_text_arg}}
+"""
+{{remove_surrounding_quotes rendered_children.free_text_arg }}
+"""{{/if}}

data/lib/templates/java/argument.hbs

@@ -1 +1 @@
-{{{ rendered_children.value }}}
+{{{escape_new_line rendered_children.value }}}

data/lib/templates/javascript/argument.hbs

@@ -1 +1 @@
-{{{ rendered_children.value }}}
+{{{escape_new_line rendered_children.value }}}

data/lib/templates/php/argument.hbs

@@ -1 +1 @@
-{{{ rendered_children.value }}}
+{{{escape_new_line rendered_children.value }}}

data/lib/templates/python/argument.hbs

@@ -1 +1 @@
-{{{ underscore rendered_children.name }}} = {{{ rendered_children.value }}}
+{{#escape_new_line}}{{{ underscore rendered_children.name }}} = {{{ rendered_children.value }}}{{/escape_new_line}}

data/lib/templates/python/property.hbs

@@ -1 +1 @@
-{{{ rendered_children.key }}}: {{{ rendered_children.value }}}
+'{{{ escape_single_quotes rendered_children.key }}}': {{{ rendered_children.value }}}

data/lib/templates/robotframework/argument.hbs

@@ -1 +1 @@
-{{{ rendered_children.value }}}
+{{{escape_new_line rendered_children.value }}}

data/lib/templates/robotframework/property.hbs

@@ -0,0 +1 @@
+{{{ rendered_children.key }}}: {{{ rendered_children.value }}}

data/lib/templates/ruby/argument.hbs

@@ -1 +1 @@
-{{{ rendered_children.value }}}
+{{{escape_new_line rendered_children.value }}}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiptest-publisher
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Hiptest R&D
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-25 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -512,6 +512,7 @@ files:
 - lib/templates/robotframework/folder.hbs
 - lib/templates/robotframework/ifthen.hbs
 - lib/templates/robotframework/parameter.hbs
+- lib/templates/robotframework/property.hbs
 - lib/templates/robotframework/scenarios.hbs
 - lib/templates/robotframework/single_scenario.hbs
 - lib/templates/robotframework/single_test.hbs
@@ -592,7 +593,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Export your tests from Hiptest into executable tests.