hiptest-publisher 1.24.0 → 1.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09445f481edaea2106196ec07def0d1a4d2a72ca36e200ad9cdcd8df69ebf36a'
-  data.tar.gz: 957f74182eaa0c91ac62d18bb514772c7bb786a7cd968124d4240e711c1fcbbe
+  metadata.gz: 9b32532cf24c1b4eb89a73d461326d4bb8b4479537006fa992791e80c0b44670
+  data.tar.gz: d8b5967b9aae9c867d5f1f04612e5ca9d90d4993408acbcec5b5cda54da20412
 SHA512:
-  metadata.gz: 686b8b9adb5b51a19e00a3750ec5fcedce02a86cf62a1e4030b3c15a856be642082f40057385ee6e13f0c689fc25154121e7e93573823e70626ee677fd43a528
-  data.tar.gz: 3fa1ef00011ebb3848c8fc8347ab2dbac1939a68ba3ae63fb41050a7b13b052de6bfd4dad669f0d927a489a454405c361d3742ba3233bda7f1b3b646d63d617b
+  metadata.gz: a5ecc59f31485f0eff1125bad4d50d015a1fd3f208264d886337108c8cd1f67c753d6dbc6886b2bd9404c31f41414b3860b42f3831114ab22b3559eb61f8ace2
+  data.tar.gz: ebefba4c226511ad9dcfa0486881ee753c8cbb2060df3ac1196e91c6db3e7331d413a41274542b5374392d168638657d8b99f20601cb2c5ad44b85067e404aa9

data/LICENSE

@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) Hiptest
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+

data/README.md

@@ -1,6 +1,7 @@
 HipTest Publisher
 ==============
 
+[![CircleCI](https://circleci.com/gh/hiptest/hiptest-publisher.svg?style=svg)](https://circleci.com/gh/hiptest/hiptest-publisher)
 [![Build Status Linux](https://travis-ci.org/hiptest/hiptest-publisher.svg?branch=master)](https://travis-ci.org/hiptest/hiptest-publisher)
 [![Build Status Windows](https://ci.appveyor.com/api/projects/status/ciahcci0ayr1oihr/branch/master?svg=true)](https://ci.appveyor.com/project/hiptest/hiptest-publisher)
 [![Gem Version](https://badge.fury.io/rb/hiptest-publisher.svg)](http://badge.fury.io/rb/hiptest-publisher)

data/lib/config/behave.conf

@@ -18,7 +18,23 @@ naming_convention = 'underscore'
 call_prefix = 'self.actionwords'
 renderer_addons = 'GherkinAddon BehaveAddon'
 
+[step_definitions_library]
+node_name = libraries
+call_prefix = 'actionwords'
+template_dirs = behave, python, common
+named_filename = 'steps_%s.py'
+renderer_addons = 'GherkinAddon'
+
 [actionwords]
 template_dirs = python, common
 filename = 'actionwords.py'
 naming_convention = 'underscore'
+
+[library]
+template_dirs =  python, common
+filename = 'actionword_library.py'
+
+[libraries]
+template_dirs = python, common
+named_filename = '%s_library.py'
+filename_convention = 'underscore'

data/lib/hiptest-publisher/handlebars_helper.rb

@@ -63,7 +63,6 @@ module Hiptest
       joiner.gsub!(/\\t/, "\t")
       joiner.gsub!(/\\n/, "\n")
 
-
       if block.nil? || block.items.empty?
         "#{items.join(joiner)}"
       else
@@ -71,14 +70,11 @@ module Hiptest
           return else_block.fn(context)
         end
 
-        current_this = context.get('this')
-        result = items.map do |item|
-          context.add_item(:this, item)
-          block.fn(context)
+        items.map do |item|
+          context.with_temporary_context(this: item) do
+            block.fn(context)
+          end
         end.join(joiner)
-
-        context.add_item(:this, current_this)
-        result
       end
     end
 
@@ -89,12 +85,9 @@ module Hiptest
     end
 
     def hh_with(context, var, name, block)
-      name = name.to_s
-      current_value = context.get(name)
-      context.add_item(name, var)
-      result = block.fn(context)
-      context.add_item(name, current_value)
-      result
+      context.with_temporary_context(name => var) do
+        block.fn(context)
+      end
     end
 
     def hh_unless(context, condition, block, else_block = nil)
@@ -285,14 +278,12 @@ module Hiptest
     end
 
     def hh_case(context, expression, block_whens, block_else = nil)
-      context.add_item(:__case_expression, expression);
-      block_whens.fn(context)
-      result = context.get("__case_result") || (block_else && block_else.fn(context).chomp) || ''
-
-      context.add_item(:__case_expression, nil)
-      context.add_item(:__case_result, nil)
+      result = nil
 
-      result
+      context.with_temporary_context(__case_expression: expression, __case_result: nil) do
+        block_whens.fn(context)
+        context.get("__case_result") || (block_else && block_else.fn(context).chomp) || ''
+      end
     end
 
     def hh_when(context, value, block)

data/lib/hiptest-publisher/options_parser.rb

@@ -4,6 +4,7 @@ require 'parseconfig'
 require 'ostruct'
 require 'digest/md5'
 require 'pathname'
+require 'ruby-handlebars/escapers/dummy_escaper'
 
 require 'hiptest-publisher/formatters/console_formatter'
 require 'hiptest-publisher/renderer_addons'
@@ -430,6 +431,8 @@ class TemplateFinder
   def handlebars
     if !@handlebars
       @handlebars = Handlebars::Handlebars.new
+      @handlebars.set_escaper(Handlebars::Escapers::DummyEscaper)
+
       register_partials
       Hiptest::HandlebarsHelper.register_helpers(@handlebars, @context)
     end

data/lib/templates/behave/library.hbs

@@ -0,0 +1,7 @@
+from behave import *
+
+
+use_step_matcher('re')
+{{#each rendered_children.library_actionwords}}
+{{{this}}}
+{{/each}}

data/lib/templates/behave/libraryactionword.hbs

@@ -0,0 +1,4 @@
+{{#if rendered_children.gherkin_used_annotations}}
+{{#each rendered_children.gherkin_used_annotations}}@{{{downcase this }}}(r'{{#remove_last_character ':'}}{{#escape_single_quotes}}{{#strip_regexp_delimiters}}{{> gherkin_pattern}}{{/strip_regexp_delimiters}}{{/escape_single_quotes}}{{/remove_last_character}}')
+{{/each}}def impl(context{{#if has_parameters?}}, {{{ join rendered_children.parameters_ordered_by_pattern ', '}}}{{/if}}):{{#indent}}
+context.actionwords.get{{capitalize library_name}}Library().{{{ 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/behave/nullliteral.hbs

@@ -0,0 +1 @@
+None

data/lib/templates/csharp/ifthen.hbs

@@ -1,7 +1,7 @@
 if ({{{ rendered_children.condition }}}) {{#curly}}
 {{#indent}}{{#each rendered_children.then}}{{{this}}}
 {{/each}}{{/indent}}
-{{#if has_else?}}{{ close_curly }} else {{open_curly}}
+{{#if has_else?}}} else {
 {{#indent}}{{#each rendered_children.else}}{{{this}}}
 {{/each}}{{/indent}}
 {{/if}}{{/curly}}

data/lib/templates/cucumber/groovy/step-definitions/actionword.hbs

@@ -1,5 +1,5 @@
-{{#if rendered_children.gherkin_annotation }}{{{ rendered_children.gherkin_annotation }}}(~"^{{#escape_backslashes_and_double_quotes}}{{> gherkin_pattern}}{{/escape_backslashes_and_double_quotes}}\$") {{#curly}} {{{ join rendered_children.parameters_ordered_by_pattern ', '}}} ->{{#indent}}
+{{#if rendered_children.gherkin_annotation }}{{{ rendered_children.gherkin_annotation }}}(~"^{{#escape_backslashes_and_double_quotes}}{{> gherkin_pattern}}{{/escape_backslashes_and_double_quotes}}\$") { {{{ join rendered_children.parameters_ordered_by_pattern ', '}}} ->{{#indent}}
 {{{ context.call_prefix }}}.{{{camelize_lower uniq_name}}}({{#if has_parameters?}}{{#join raw_parameter_names ', '}}{{{camelize_lower this}}}{{/join}}{{/if}})
 {{/indent}}
-{{/curly}}
+}
 {{/if}}

data/lib/templates/cucumber/groovy/step-definitions/libraryactionword.hbs

@@ -1,5 +1,5 @@
-{{#if rendered_children.gherkin_annotation }}{{{ rendered_children.gherkin_annotation }}}(~"^{{#escape_backslashes_and_double_quotes}}{{> gherkin_pattern}}{{/escape_backslashes_and_double_quotes}}\$") {{#curly}} {{{ join rendered_children.parameters_ordered_by_pattern ', '}}} ->{{#indent}}
+{{#if rendered_children.gherkin_annotation }}{{{ rendered_children.gherkin_annotation }}}(~"^{{#escape_backslashes_and_double_quotes}}{{> gherkin_pattern}}{{/escape_backslashes_and_double_quotes}}\$") { {{{ join rendered_children.parameters_ordered_by_pattern ', '}}} ->{{#indent}}
 {{{ context.call_prefix }}}.get{{{camelize library_name}}}Library().{{{camelize_lower uniq_name}}}({{#if has_parameters?}}{{#join raw_parameter_names ', '}}{{{camelize_lower this}}}{{/join}}{{/if}})
 {{/indent}}
-{{/curly}}
+}
 {{/if}}

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

@@ -1,5 +1,5 @@
-import {{#curly}} After, Before, Given, When, Then, TableDefinition {{/curly}} from "cucumber";
-import {{#curly}} ActionWords {{/curly}} from './actionwords';
+import { After, Before, Given, When, Then, TableDefinition } from "cucumber";
+import { ActionWords } from './actionwords';
 
 let actionWords : ActionWords;
 {{> before_hook}}

data/lib/templates/gherkin/argument.hbs

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

data/lib/templates/java/ifthen.hbs

@@ -1,7 +1,7 @@
 if ({{{ rendered_children.condition }}}) {{#curly}}
 {{#indent}}{{#each rendered_children.then}}{{{this}}}
 {{/each}}{{/indent}}
-{{#if has_else?}}{{ close_curly }} else {{open_curly}}
+{{#if has_else?}}} else {
 {{#indent}}{{#each rendered_children.else}}{{{this}}}
 {{/each}}{{/indent}}
 {{/if}}{{/curly}}

data/lib/templates/javascript/ifthen.hbs

@@ -1,7 +1,7 @@
 if ({{{ rendered_children.condition }}}) {{#curly}}
 {{#indent}}{{#each rendered_children.then}}{{{this}}}{{/each}}
 {{/indent}}
-{{#if has_else?}}{{close_curly}} else {{open_curly}}
+{{#if has_else?}}} else {
 {{#indent}}{{#each rendered_children.else}}{{{this}}}{{/each}}
 {{/indent}}
 {{/if}}{{/curly}}

data/lib/templates/jbehave/folder.hbs

@@ -1,6 +1,6 @@
 {{{ rendered_children.name }}}
 {{#if context.parent_folder_tags}}{{#if rendered_children.ancestor_tags}}Meta:
-{{rendered_children.ancestor_tags}}{{/if}}{{#if has_tags?}}{{#if rendered_children.ancestor_tags}} {{else}}Meta:
+{{join rendered_children.ancestor_tags " "}}{{/if}}{{#if has_tags?}}{{#if rendered_children.ancestor_tags}} {{else}}Meta:
 {{/if}}{{join rendered_children.tags " "}}
 {{/if}}{{else}}Meta:
 {{join rendered_children.tags " "}}

data/lib/templates/php/ifthen.hbs

@@ -1,7 +1,7 @@
 if ({{{ rendered_children.condition }}}) {{#curly}}
 {{#indent}}{{#each rendered_children.then}}{{{this}}}{{/each}}
 {{/indent}}
-{{#if has_else?}}{{close_curly}} else {{open_curly}}
+{{#if has_else?}}} else {
 {{#indent}}{{#each rendered_children.else}}{{{this}}}{{/each}}
 {{/indent}}
 {{/if}}{{/curly}}

data/lib/templates/php/template.hbs

@@ -1 +1 @@
-"{{#each treated_chunks}}{{#if this.is_variable?}}{{#curly}}${{{camelize_lower this.raw.children.name}}}{{/curly}}{{else}}{{{ escape_double_quotes this.raw.children.value }}}{{/if}}{{/each}}"
+"{{#each treated_chunks}}{{#if this.is_variable?}}{${{{camelize_lower this.raw.children.name}}}}{{else}}{{{ escape_double_quotes this.raw.children.value }}}{{/if}}{{/each}}"

data/lib/templates/python/actionwords.hbs

@@ -1,6 +1,9 @@
 # encoding: UTF-8
 
-class Actionwords:{{#indent}}
+{{#if uses_library?}}from steps.actionword_library import ActionwordLibrary{{/if}}
+
+
+class Actionwords{{#if uses_library?}}(ActionwordLibrary){{/if}}:{{#indent}}
 def __init__(self):{{#indent}}
 pass{{/indent}}
 

data/lib/templates/python/call.hbs

@@ -1,2 +1,2 @@
 {{#if has_annotation? }}{{#comment '#'}}{{{ rendered_children.gherkin_text }}}{{/comment}}
-{{/if}}self.{{#if context.call_prefix}}{{{ context.call_prefix }}}.{{/if}}{{{ underscore rendered_children.actionword }}}({{{ join rendered_children.arguments ', '}}})
+{{/if}}self.{{#if context.call_prefix}}{{{ context.call_prefix }}}.{{/if}}{{#if is_shared?}}get{{{camelize rendered_children.library_name}}}Library().{{/if}}{{{ underscore rendered_children.actionword }}}({{{ join rendered_children.all_arguments ', '}}})

data/lib/templates/python/libraries.hbs

@@ -0,0 +1,9 @@
+# encoding: UTF-8
+
+{{#each library_names}}from steps.{{downcase this}}_library import {{camelize this}}Library
+{{/each}}
+
+class ActionwordLibrary:{{#indent}}{{#each library_names}}
+def get{{camelize this}}Library(self):{{#indent}}
+return {{camelize this}}Library(self){{/indent}}
+{{/each}}{{/indent}}

data/lib/templates/python/library.hbs

@@ -0,0 +1,17 @@
+# encoding: UTF-8
+
+from behave import *
+
+
+class {{capitalize rendered_children.name}}Library:{{#indent}}
+__instance = None
+
+def __new__(cls, context):{{#indent}}
+if {{capitalize rendered_children.name}}Library.__instance is None{{#indent}}
+{{capitalize rendered_children.name}}Library.__instance = object.__new__(cls){{/indent}}
+
+return {{capitalize rendered_children.name}}Library.__instance{{/indent}}
+
+{{#each rendered_children.library_actionwords}}{{{this}}}
+{{/each}}
+{{/indent}}

data/lib/templates/python/libraryactionword.hbs

@@ -0,0 +1 @@
+{{> item_as_def}}

data/lib/templates/robotframework/scenarios.hbs

@@ -13,7 +13,7 @@ Resource{{tab}}keywords.txt
 *** 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'}}
+[Arguments]{{tab}}${__test_name}{{tab}}{{join this.parameters '\t'}}
 {{#if this.tags}}[Tags]{{tab}}{{{ join this.tags '\t'}}}
 {{/if}}{{join this.body '\n'}}{{/indent}}
 

data/lib/templates/typescript/actionwords.hbs

@@ -1,4 +1,4 @@
-import {{#curly}} TableDefinition {{/curly}} from "cucumber";
+import { TableDefinition } from "cucumber";
 
 export class ActionWords {{#curly}}{{#indent}}
 {{#each rendered_children.actionwords}}{{{this}}}

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: hiptest-publisher
 version: !ruby/object:Gem::Version
-  version: 1.24.0
+  version: 1.25.0
 platform: ruby
 authors:
 - HipTest R&D
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-21 00:00:00.000000000 Z
+date: 2019-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.5
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.5
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.5
 - !ruby/object:Gem::Dependency
   name: parseconfig
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.4
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.4
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -74,56 +74,56 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.10'
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.10'
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: multipart-post
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.1
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.1
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: ruby-handlebars
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: ruby_version
   requirement: !ruby/object:Gem::Requirement
@@ -198,22 +198,22 @@ dependencies:
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.6
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.6
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.6
 - !ruby/object:Gem::Dependency
   name: i18n-tasks
   requirement: !ruby/object:Gem::Requirement
@@ -249,8 +249,10 @@ executables:
 - hiptest-publisher
 extensions: []
 extra_rdoc_files:
+- LICENSE
 - README.md
 files:
+- LICENSE
 - README.md
 - bin/hiptest-publisher
 - config/i18n-tasks.yml
@@ -323,6 +325,9 @@ files:
 - lib/templates/behat/parameter.hbs
 - lib/templates/behave/actionword.hbs
 - lib/templates/behave/actionwords.hbs
+- lib/templates/behave/library.hbs
+- lib/templates/behave/libraryactionword.hbs
+- lib/templates/behave/nullliteral.hbs
 - lib/templates/common/_gherkin_pattern.hbs
 - lib/templates/common/booleanliteral.hbs
 - lib/templates/common/dataset.hbs
@@ -588,6 +593,9 @@ files:
 - lib/templates/python/folder.hbs
 - lib/templates/python/ifthen.hbs
 - lib/templates/python/index.hbs
+- lib/templates/python/libraries.hbs
+- lib/templates/python/library.hbs
+- lib/templates/python/libraryactionword.hbs
 - lib/templates/python/list.hbs
 - lib/templates/python/nullliteral.hbs
 - lib/templates/python/parameter.hbs
@@ -704,8 +712,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Export your tests from HipTest into executable tests.