hiptest-publisher 0.18.5 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58653c94c1e3cbeda859d5c82caac9b56ade125e
-  data.tar.gz: 63bde1a925b9b850bdcfe2671eb5cc92fcdab629
+  metadata.gz: bf6890beff64e12d0d847f95e23a854c33fc49d5
+  data.tar.gz: 283d4d11acf6e9ff5d7eacdbf0058de77db7035c
 SHA512:
-  metadata.gz: 1d757cf39e96c0132bf765f7c538a0f83ca0bef7b704e69be207a7586bf4f58b3074a4878b19bdc80796b29dde1886079baee38e069872d6ad0d6110e6e5bc83
-  data.tar.gz: 5efa7e8f4fce14583c9c3ad2a423f18ce03fe673c2ba1a25d85dac1921da3c3d9585d451a567aec5776039d526a8c7ccbc636a691c1527352b25eb8e2b269951
+  metadata.gz: 67e1b24d37eae1d25d5d9fff1eaeccd215b5e336d216d0b40b617e7bb07fbc4d7750d8454fb2af23020ab50577e42b37eee7730b998cbad9a39aa0c857a8bb14
+  data.tar.gz: 74b69b786dc0d2aa979c3d8af3ef50767892f06b6e4c831095fd662729d5d8dae8e400868b6806758658e2cdc50eb5d4a5d16addf410a7c351987e4541a7f969

data/lib/hiptest-publisher/gherkin_adder.rb

@@ -11,6 +11,8 @@ module Hiptest
       @project = project
       @indexer = ActionwordIndexer.new(project)
       @annotations_counter = AnnotationsCounter.new
+
+      @special_params = ['__free_text', '__datatable']
     end
 
     def update_calls
@@ -62,7 +64,7 @@ module Hiptest
         end
       end
 
-      missing_parameter_names = all_arguments.keys - inline_parameter_names - ['__free_text']
+      missing_parameter_names = all_arguments.keys - inline_parameter_names - @special_params
 
       prettified = call_chunks.join("\"")
       missing_parameter_names.each do |missing_parameter_name|
@@ -87,7 +89,7 @@ module Hiptest
           result << inline_parameter_name if inline_parameter_name
         end
       end
-      missing_parameter_names = actionword_parameters.keys - inline_parameter_names - ['__free_text']
+      missing_parameter_names = actionword_parameters.keys - inline_parameter_names - @special_params
 
       patterned = result.join("\"")
       missing_parameter_names.each do |missing_parameter_name|

data/lib/hiptest-publisher/handlebars_helper.rb

@@ -231,10 +231,19 @@ module Hiptest
       return regexp.gsub(/(^\^)|(\$$)/, '')
     end
 
+    def hh_remove_last_character(context, character = '', block)
+      txt = block.fn(context)
+      return txt[-1] == character ? txt[0..-2] : txt
+    end
+
     def hh_trim_surrounding_characters(context, character, block)
       return block.fn(context).gsub(/(\A(#{character})*)|((#{character})*\z)/, '')
     end
 
+    def hh_replace(context, str, replacement, block)
+      return block.fn(context).gsub(str, replacement)
+    end
+
     def hh_debug(context, block)
       require 'pry'
       binding.pry

data/lib/hiptest-publisher/nodes.rb

@@ -207,6 +207,10 @@ module Hiptest
       def free_text?
         @children[:name] == "__free_text"
       end
+
+      def datatable?
+        @children[:name] == "__datatable"
+      end
     end
 
     class Call < Node
@@ -219,6 +223,10 @@ module Hiptest
       def free_text_arg
         children[:arguments].find(&:free_text?)
       end
+
+      def datatable_arg
+        children[:arguments].find(&:datatable?)
+      end
     end
 
     class IfThen < Node
@@ -266,6 +274,10 @@ module Hiptest
       def free_text?
         @children[:name] == "__free_text"
       end
+
+      def datatable?
+        @children[:name] == "__datatable"
+      end
     end
 
     class Item < Node

data/lib/hiptest-publisher/render_context_maker.rb

@@ -94,6 +94,7 @@ module Hiptest
     def walk_parameter(p)
       {
         :is_free_text? => p.free_text?,
+        :is_datatable? => p.datatable?,
         :is_bool? => p.children[:type] == :bool,
         :has_default_value? => !p.children[:default].nil?
       }

data/lib/hiptest-publisher/renderer.rb

@@ -23,11 +23,15 @@ module Hiptest
     end
 
     def walk_call(call)
-      # For Gherkin, we need the __free_text argument rendered.
+      # For Gherkin, we need the special arguments rendered.
       if call.free_text_arg
         @rendered_children[:free_text_arg] = @rendered[call.free_text_arg.children[:value]]
       end
 
+      if call.datatable_arg
+        @rendered_children[:datatable_arg] = @rendered[call.datatable_arg.children[:value]]
+      end
+
       super(call)
     end
 

data/lib/templates/behat/parameter.hbs

@@ -1 +1 @@
-{{#if is_free_text?}}PyStringNode {{/if}}${{{underscore rendered_children.name}}}
+{{#if is_datatable?}}TableNode {{/if}}{{#if is_free_text?}}PyStringNode {{/if}}${{{underscore rendered_children.name}}}

data/lib/templates/behave/actionword.hbs

@@ -1,4 +1,4 @@
 {{#if rendered_children.gherkin_used_annotations}}
-{{#each rendered_children.gherkin_used_annotations}}@{{{downcase this }}}(r'{{{ strip_regexp_delimiters rendered_children.gherkin_pattern }}}')
+{{#each rendered_children.gherkin_used_annotations}}@{{{downcase this }}}(r'{{#remove_last_character ':'}}{{{ strip_regexp_delimiters rendered_children.gherkin_pattern }}}{{/remove_last_character}}')
 {{/each}}def impl(context{{#if has_parameters?}}, {{{ join rendered_children.parameters ', '}}}{{/if}}):{{#indent}}
-context.actionwords.{{{ underscore rendered_children.name }}}({{#if has_parameters?}}{{#join raw_parameter_names ', '}}{{#trim_surrounding_characters "__"}}{{{underscore this}}}{{/trim_surrounding_characters}}{{/join}}{{/if}}){{/indent}}{{/if}}
+context.actionwords.{{{ underscore rendered_children.name }}}({{#if has_parameters?}}{{#join raw_parameter_names ', '}}{{#replace "__datatable" "context.table"}}{{#replace "__free_text" "context.text"}}{{{underscore this}}}{{/replace}}{{/replace}}{{/join}}{{/if}}){{/indent}}{{/if}}

data/lib/templates/cucumber/java/actionwords.hbs

@@ -1,5 +1,6 @@
 package {{{ context.package }}};
 
+import cucumber.api.DataTable;
 import cucumber.api.java.en.*;
 
 public class StepDefinitions {{#curly}}{{#indent}}

data/lib/templates/cucumber/java/parameter.hbs

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

data/lib/templates/gherkin/call.hbs

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

data/lib/templates/specflow/parameter.hbs

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiptest-publisher
 version: !ruby/object:Gem::Version
-  version: 0.18.5
+  version: 0.19.0
 platform: ruby
 authors:
 - Hiptest R&D
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-26 00:00:00.000000000 Z
+date: 2017-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -339,6 +339,7 @@ files:
 - lib/templates/cucumber/actionwords.hbs
 - lib/templates/cucumber/java/actionword.hbs
 - lib/templates/cucumber/java/actionwords.hbs
+- lib/templates/cucumber/java/parameter.hbs
 - lib/templates/cucumber/javascript/_after_hook.hbs
 - lib/templates/cucumber/javascript/_before_hook.hbs
 - lib/templates/cucumber/javascript/actionword.hbs
@@ -585,6 +586,7 @@ files:
 - lib/templates/seleniumide/tests.hbs
 - lib/templates/specflow/actionword.hbs
 - lib/templates/specflow/actionwords.hbs
+- lib/templates/specflow/parameter.hbs
 homepage: https://hiptest.net
 licenses:
 - GPL-2.0
@@ -605,7 +607,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Export your tests from Hiptest into executable tests.