hiptest-publisher 0.15.9 → 0.15.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 022ac15f7f0c91507fa65a5643de30fead66738d
-  data.tar.gz: 7355b77f8e1e5a6767a276b94d27b75c305a8c27
+  metadata.gz: 67f9fb69134dd2a3e084acd9ac614198a9c27a0b
+  data.tar.gz: 18fb9ed4914a371f3f8ca61b15f60f5db51c983e
 SHA512:
-  metadata.gz: 52e690c26642740d83744044ea6fd2f599cb8469556668956f06b3a249853552ebb6d51bc63fec085b371389f04c825822e379e652ac52ba654a105647c9ed08
-  data.tar.gz: 2367aee3013df421e9a2203773f49f81dc73b2d3caecd16c94ee0c537de2583a1415d27cedbdb618d2fc79efada70b24dd1303e669adac742d8ea11b42448987
+  metadata.gz: 268cc8c1076a9cc53158b0c31e461ca6e032874e32260af9735e92a02632494a96922596e3f7f5b46800e98e6b406f19240cfb5a9cf08801219e9bbce855ff3a
+  data.tar.gz: 317d4198410c9d6f1c3d9b950fe3a430c0e67c3bee374b9b261a185f3583fabbf3377fe78020e6a51e579bd91b4828e9c8fb358727ed1f764e77f9e4d511784e

data/lib/hiptest-publisher/gherkin_adder.rb

@@ -87,7 +87,7 @@ module Hiptest
           result << inline_parameter_name if inline_parameter_name
         end
       end
-      missing_parameter_names = actionword_parameters.keys - inline_parameter_names
+      missing_parameter_names = actionword_parameters.keys - inline_parameter_names - ['__free_text']
 
       patterned = result.join("\"")
       missing_parameter_names.each do |missing_parameter_name|

data/lib/hiptest-publisher/nodes.rb

@@ -203,6 +203,10 @@ module Hiptest
         super()
         @children = {:name => name, :value => value}
       end
+
+      def free_text?
+        @children[:name] == "__free_text"
+      end
     end
 
     class Call < Node
@@ -211,6 +215,10 @@ module Hiptest
         annotation = nil if annotation == ""
         @children = {:actionword => actionword, :arguments => arguments, :all_arguments => arguments, :annotation => annotation}
       end
+
+      def free_text_arg
+        children[:arguments].find(&:free_text?)
+      end
     end
 
     class IfThen < Node
@@ -254,6 +262,10 @@ module Hiptest
           @children[:type].to_s
         end
       end
+
+      def free_text?
+        @children[:name] == "__free_text"
+      end
     end
 
     class Item < Node

data/lib/hiptest-publisher/render_context_maker.rb

@@ -93,6 +93,7 @@ module Hiptest
 
     def walk_parameter(p)
       {
+        :is_free_text? => p.free_text?,
         :has_default_value? => !p.children[:default].nil?
       }
     end

data/lib/hiptest-publisher/renderer.rb

@@ -24,12 +24,8 @@ module Hiptest
 
     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]]
+      if call.free_text_arg
+        @rendered_children[:free_text_arg] = @rendered[call.free_text_arg.children[:value]]
       end
 
       super(call)

data/lib/templates/cucumber/javascript/_after_hook.hbs

@@ -0,0 +1,4 @@
+this.After(function (scenario) {{#curly}}{{#indent}}
+this.actionwords = null;
+{{/indent}}
+{{/curly}});

data/lib/templates/cucumber/javascript/_before_hook.hbs

@@ -0,0 +1,4 @@
+this.Before(function (scenario) {{#curly}}{{#indent}}
+this.actionwords = Object.create(require('{{{ relative_path './actionwords.js' }}}').Actionwords);
+{{/indent}}
+{{/curly}});

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

@@ -1,5 +1,7 @@
 module.exports = function () {{#curly}}{{#indent}}
-{{> around_hook}}
+{{> before_hook}}
+
+{{> after_hook}}
 
 {{#each rendered_children.actionwords}}{{{this}}}
 {{/each}}{{/indent}}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiptest-publisher
 version: !ruby/object:Gem::Version
-  version: 0.15.9
+  version: 0.15.10
 platform: ruby
 authors:
 - Hiptest R&D
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2016-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -340,7 +340,8 @@ files:
 - lib/templates/cucumber/java/actionword.hbs
 - lib/templates/cucumber/java/actionwords.hbs
 - lib/templates/cucumber/java/parameter.hbs
-- lib/templates/cucumber/javascript/_around_hook.hbs
+- lib/templates/cucumber/javascript/_after_hook.hbs
+- lib/templates/cucumber/javascript/_before_hook.hbs
 - lib/templates/cucumber/javascript/actionword.hbs
 - lib/templates/cucumber/javascript/actionwords.hbs
 - lib/templates/cucumber/parameter.hbs

data/lib/templates/cucumber/javascript/_around_hook.hbs

@@ -1,8 +0,0 @@
-this.Around(function (scenario, runScenario) {{#curly}}{{#indent}}
-this.actionwords = Object.create(require('{{{ relative_path './actionwords.js' }}}').Actionwords);
-runScenario(null, function () {{#curly}}{{#indent}}
-this.actionwords = null;
-{{/indent}}
-{{/curly}});
-{{/indent}}
-{{/curly}});