hiptest-publisher 1.10.1 → 1.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a877b09d5680c92090947262c403126a97a83d8
-  data.tar.gz: cd24230a8f4c7222ab715fa7c39ad39c7043e728
+  metadata.gz: 8298bd41394d87d7001e44e9c85fdffd104f927b
+  data.tar.gz: 49a13acc066ef854861600ea66ebbbd2a2778d4a
 SHA512:
-  metadata.gz: d92b261bc905cd83133a3c5beb70a4d8a79a0af30b2bb6561b71a09370663cbd51bd0055095f689d480c7251acb26976c99afe4d9c593d75ac675d76e4d88faf
-  data.tar.gz: 9871151e896f7900e13f968495235b21d80cacb9a5d67a9f4ef0181738c48b60f4c54f930c428cbab9252f0136303b911ed45b8140634855d91722e27ec618eb
+  metadata.gz: 70123f226704ddf6c4a36e43ef23f847f97e0b49f597674cea525d46ff77aa9a52b8faedfab0775d10eb5ca2059f01c2fd3777d65dadd58ac7eef35f79ba02f6
+  data.tar.gz: c6f96de1d29f2206f86d05eb12fafdba929f3188972e7cf9adabdc3f39bd5bf8ed686e2630ff8c36693c819b0459b8c379aa921cd7dd35fc5601f6849217ef36

data/lib/config/behat.conf

@@ -21,4 +21,3 @@ template_dirs = behat/actionwords, php, common
 filename = 'Actionwords.php'
 naming_convention = 'camel_case'
 call_prefix = '$this'
-

data/lib/config/behave.conf

@@ -5,7 +5,7 @@ fallback_template = 'empty'
 [features]
 indentation = '  '
 node_name = folders
-template_dirs = gherkin, common
+template_dirs = gherkin/inlined_uids, gherkin, common
 named_filename = '%s.feature'
 filename_convention = 'underscore'
 

data/lib/config/cucumber-java.conf

@@ -5,7 +5,7 @@ fallback_template = 'empty'
 
 [features]
 node_name = folders
-template_dirs = gherkin/java, gherkin, common
+template_dirs = gherkin/inlined_uids, gherkin/java, gherkin, common
 named_filename = '%s.feature'
 indentation = '  '
 

data/lib/config/cucumber-javascript.conf

@@ -4,7 +4,7 @@ fallback_template = 'empty'
 
 [features]
 node_name = folders
-template_dirs = gherkin, common
+template_dirs = gherkin/inlined_uids, gherkin, common
 named_filename = '%s.feature'
 indentation = '  '
 

data/lib/hiptest-publisher/actionword_indexer.rb

@@ -17,8 +17,8 @@ module Hiptest
         end
 
         @indexed[aw_name] = {
-          :actionword => aw,
-          :parameters => indexed_parameters
+          actionword: aw,
+          parameters: indexed_parameters
         }
 
       end

data/lib/hiptest-publisher/diff_displayer.rb

@@ -153,9 +153,7 @@ module Hiptest
     private
 
     def output(lines, add_empty_line: true)
-      lines = [lines] unless lines.is_a? Array
-
-      puts lines.join("\n")
+      puts Array(lines).join("\n")
       puts "" if add_empty_line
     end
 

data/lib/hiptest-publisher/file_writer.rb

@@ -16,7 +16,7 @@ module Hiptest
         end
       end
     rescue => err
-      reporter.dump_error(err)
+      @reporter.dump_error(err)
     end
 
     private

data/lib/hiptest-publisher/nodes.rb

@@ -94,7 +94,7 @@ module Hiptest
     class Literal < Node
       def initialize(value)
         super()
-        @children = {:value => value}
+        @children = {value: value}
       end
     end
 
@@ -117,91 +117,91 @@ module Hiptest
     class Variable < Node
       def initialize(name)
         super()
-        @children = {:name => name}
+        @children = {name: name}
       end
     end
 
     class Symbol < Node
       def initialize(value, delimiter)
         super()
-        @children = {:delimiter => delimiter, :value => value}
+        @children = {delimiter: delimiter, value: value}
       end
     end
 
     class Property < Node
       def initialize(key, value)
         super()
-        @children = {:key => key, :value => value}
+        @children = {key: key, value: value}
       end
     end
 
     class Field < Node
       def initialize(base, name)
         super()
-        @children = {:base => base, :name => name}
+        @children = {base: base, name: name}
       end
     end
 
     class Index < Node
       def initialize(base, expression)
         super()
-        @children = {:base => base, :expression => expression}
+        @children = {base: base, expression: expression}
       end
     end
 
     class BinaryExpression < Node
       def initialize(left, operator, right)
         super()
-        @children = {:operator => operator, :left => left, :right => right}
+        @children = {operator: operator, left: left, right: right}
       end
     end
 
     class UnaryExpression < Node
       def initialize(operator, expression)
         super()
-        @children = {:operator => operator, :expression => expression}
+        @children = {operator: operator, expression: expression}
       end
     end
 
     class Parenthesis < Node
       def initialize(content)
         super()
-        @children = {:content => content}
+        @children = {content: content}
       end
     end
 
     class List < Node
       def initialize(items)
         super()
-        @children = {:items => items}
+        @children = {items: items}
       end
     end
 
     class Dict < Node
       def initialize(items)
         super()
-        @children = {:items => items}
+        @children = {items: items}
       end
     end
 
     class Template < Node
       def initialize(chunks)
         super()
-        @children = {:chunks => chunks}
+        @children = {chunks: chunks}
       end
     end
 
     class Assign < Node
       def initialize(to, value)
         super()
-        @children = {:to => to, :value => value}
+        @children = {to: to, value: value}
       end
     end
 
     class Argument < Node
       def initialize(name, value)
         super()
-        @children = {:name => name, :value => value}
+        @children = {name: name, value: value}
       end
 
       def free_text?
@@ -220,7 +220,7 @@ module Hiptest
       def initialize(actionword, arguments = [], annotation = nil)
         super()
         annotation = nil if annotation == ""
-        @children = {:actionword => actionword, :arguments => arguments, :all_arguments => arguments, :annotation => annotation}
+        @children = {actionword: actionword, arguments: arguments, all_arguments: arguments, annotation: annotation}
 
         @chunks = []
         @extra_inlined_arguments = []
@@ -238,28 +238,28 @@ module Hiptest
     class IfThen < Node
       def initialize(condition, then_, else_ = [])
         super()
-        @children = {:condition => condition, :then => then_, :else => else_}
+        @children = {condition: condition, then: then_, else: else_}
       end
     end
 
     class Step < Node
       def initialize(key, value)
         super()
-        @children = {:key => key, :value => value}
+        @children = {key: key, value: value}
       end
     end
 
     class While < Node
       def initialize(condition, body)
         super()
-        @children = {:condition => condition, :body => body}
+        @children = {condition: condition, body: body}
       end
     end
 
     class Tag < Node
       def initialize(key, value = nil)
         super()
-        @children = {:key => key, :value => value}
+        @children = {key: key, value: value}
       end
 
       def to_s
@@ -270,7 +270,7 @@ module Hiptest
     class Parameter < Node
       def initialize(name, default = nil)
         super()
-        @children = {:name => name, :default => default}
+        @children = {name: name, default: default}
       end
 
       def type
@@ -296,11 +296,11 @@ module Hiptest
       def initialize(name, tags = [], description = '', parameters = [], body = [])
         super()
         @children = {
-          :name => name,
-          :tags => tags,
-          :description => description,
-          :parameters => parameters,
-          :body => body
+          name: name,
+          tags: tags,
+          description: description,
+          parameters: parameters,
+          body: body
         }
       end
 
@@ -366,10 +366,10 @@ module Hiptest
         super()
 
         @children = {
-          :name => name,
-          :description => description,
-          :tags => tags,
-          :body => body
+          name: name,
+          description: description,
+          tags: tags,
+          body: body
         }
       end
 
@@ -383,7 +383,7 @@ module Hiptest
         super()
 
         @children = {
-          :datasets => datasets
+          datasets: datasets
         }
       end
     end
@@ -393,8 +393,8 @@ module Hiptest
         super()
 
         @children = {
-          :name => name,
-          :arguments => arguments
+          name: name,
+          arguments: arguments
         }
       end
 
@@ -407,7 +407,7 @@ module Hiptest
       attr_reader :to_implement, :no_implement
       def initialize(actionwords = [])
         super()
-        @children = {:actionwords => actionwords}
+        @children = {actionwords: actionwords}
         mark_actionwords_for_implementation
         index_actionwords
       end
@@ -442,7 +442,7 @@ module Hiptest
     class Scenarios < Node
       def initialize(scenarios = [])
         super()
-        @children = {:scenarios => scenarios}
+        @children = {scenarios: scenarios}
         scenarios.each {|sc| sc.parent = self}
       end
     end
@@ -450,7 +450,7 @@ module Hiptest
     class Tests < Node
       def initialize(tests = [])
         super()
-        @children = {:tests => tests}
+        @children = {tests: tests}
         tests.each {|test| test.parent = self}
       end
     end
@@ -466,12 +466,12 @@ module Hiptest
         @order_in_parent = order_in_parent
 
         @children = {
-          :name => name,
-          :description => description,
-          :subfolders => [],
-          :scenarios => [],
-          :tags => tags,
-          :body => body
+          name: name,
+          description: description,
+          subfolders: [],
+          scenarios: [],
+          tags: tags,
+          body: body
         }
       end
 
@@ -501,8 +501,8 @@ module Hiptest
         super()
         @uids_mapping = {}
         @children = {
-          :root_folder => nil,
-          :folders => folders
+          root_folder: nil,
+          folders: folders
         }
       end
 
@@ -536,12 +536,12 @@ module Hiptest
         tests.parent = self
 
         @children = {
-          :name => name,
-          :description => description,
-          :test_plan => test_plan,
-          :scenarios => scenarios,
-          :actionwords => actionwords,
-          :tests => tests
+          name: name,
+          description: description,
+          test_plan: test_plan,
+          scenarios: scenarios,
+          actionwords: actionwords,
+          tests: tests
         }
       end
 

data/lib/hiptest-publisher/options_parser.rb

@@ -704,13 +704,13 @@ class LanguageConfigParser
   def make_language_group_config group_name
     # List of options that can be set in the config file but not in command line
     non_visible_options = {
-      :package => @cli_options.package,
-      :namespace => @cli_options.namespace,
-      :test_export_dir => @cli_options.test_export_dir,
-      :tests_ouput_dir => @cli_options.tests_ouput_dir,
-      :features_output_directory => @cli_options.features_output_directory,
-      :step_definitions_output_directory => @cli_options.step_definitions_output_directory,
-      :actionwords_output_directory => @cli_options.actionwords_output_directory
+      package: @cli_options.package,
+      namespace: @cli_options.namespace,
+      test_export_dir: @cli_options.test_export_dir,
+      tests_ouput_dir: @cli_options.tests_ouput_dir,
+      features_output_directory: @cli_options.features_output_directory,
+      step_definitions_output_directory: @cli_options.step_definitions_output_directory,
+      actionwords_output_directory: @cli_options.actionwords_output_directory
     }
 
     language_group_params = group_config('_common')

data/lib/hiptest-publisher/render_context_maker.rb

@@ -2,14 +2,14 @@ module Hiptest
   module RenderContextMaker
     def walk_item(item)
       {
-        :has_description? => !item.children[:description].nil? && !item.children[:description].empty?,
-        :has_parameters? => !item.children[:parameters].empty?,
-        :has_tags? => !item.children[:tags].empty?,
-        :has_step? => has_step?(item),
-        :is_empty? => item.children[:body].empty?,
-        :declared_variables => item.declared_variables_names,
-        :raw_parameter_names => item.children[:parameters].map {|p| p.children[:name] },
-        :self_name => item.children[:name],
+        has_description?: !item.children[:description].nil? && !item.children[:description].empty?,
+        has_parameters?: !item.children[:parameters].empty?,
+        has_tags?: !item.children[:tags].empty?,
+        has_step?: has_step?(item),
+        is_empty?: item.children[:body].empty?,
+        declared_variables: item.declared_variables_names,
+        raw_parameter_names: item.children[:parameters].map {|p| p.children[:name] },
+        self_name: item.children[:name],
       }
     end
 
@@ -17,117 +17,117 @@ module Hiptest
       relative_package = @context.relative_path.split('/')[0...-1].join('.')
       relative_package = ".#{relative_package}" unless relative_package.empty?
       {
-        :needs_to_import_actionwords? => @context.relative_path.count('/') > 0,
-        :relative_package => relative_package,
+        needs_to_import_actionwords?: @context.relative_path.count('/') > 0,
+        relative_package: relative_package,
       }
     end
 
     def walk_actionword(aw)
       walk_item(aw).merge(
-        :chunks => aw.chunks || [],
-        :extra_inlined_parameters => aw.extra_inlined_parameters || []
+        chunks: aw.chunks || [],
+        extra_inlined_parameters: aw.extra_inlined_parameters || []
       )
     end
 
     def walk_folder(folder)
       walk_relative_item(folder).merge(
-        :self_name => folder.children[:name],
-        :has_tags? => !folder.children[:tags].empty?,
-        :has_step? => has_step?(folder),
-        :is_empty? => folder.children[:body].empty?,
-        :datatables_present? => datatable_present?(folder)
+        self_name: folder.children[:name],
+        has_tags?: !folder.children[:tags].empty?,
+        has_step?: has_step?(folder),
+        is_empty?: folder.children[:body].empty?,
+        datatables_present?: datatable_present?(folder)
       )
     end
 
     def walk_scenario(scenario)
       walk_item(scenario).merge(walk_relative_item(scenario)).merge(
-        :project_name => scenario.parent.parent.children[:name],
-        :has_datasets? => has_datasets?(scenario),
-        :has_annotations? => has_annotations?(scenario)
+        project_name: scenario.parent.parent.children[:name],
+        has_datasets?: has_datasets?(scenario),
+        has_annotations?: has_annotations?(scenario)
       )
     end
 
     def walk_dataset(dataset)
       datatable = dataset.parent
       {
-        :scenario_name => datatable.parent.children[:name]
+        scenario_name: datatable.parent.children[:name]
       }
     end
 
     def walk_scenarios(scenarios)
       project = scenarios.parent
       {
-        :project_name => project.children[:name],
-        :self_name => project.children[:name],
-        :datatables_present? => datatable_present?(scenarios)
+        project_name: project.children[:name],
+        self_name: project.children[:name],
+        datatables_present?: datatable_present?(scenarios)
       }
     end
 
     def walk_test(test)
       {
-        :has_description? => !test.children[:description].nil? && !test.children[:description].empty?,
-        :has_parameters? => false,
-        :has_tags? => !test.children[:tags].empty?,
-        :has_step? => has_step?(test),
-        :is_empty? => test.children[:body].empty?,
-        :has_datasets? => false,
-        :project_name => test.parent.parent.children[:name],
-        :self_name => test.children[:name],
+        has_description?: !test.children[:description].nil? && !test.children[:description].empty?,
+        has_parameters?: false,
+        has_tags?: !test.children[:tags].empty?,
+        has_step?: has_step?(test),
+        is_empty?: test.children[:body].empty?,
+        has_datasets?: false,
+        project_name: test.parent.parent.children[:name],
+        self_name: test.children[:name],
       }
     end
 
     def walk_tests(tests)
       project = tests.parent
       {
-        :project_name => project.children[:name],
-        :self_name => project.children[:name]
+        project_name: project.children[:name],
+        self_name: project.children[:name]
       }
     end
 
     def walk_call(c)
       {
-        :has_arguments? => !c.children[:arguments].empty?,
-        :has_annotation? => !c.children[:annotation].nil?,
-        :in_actionword? => c.parent.is_a?(Hiptest::Nodes::Actionword),
-        :in_datatabled_scenario? => c.parent.is_a?(Hiptest::Nodes::Scenario) && has_datasets?(c.parent),
-        :chunks => c.chunks || [],
-        :extra_inlined_arguments => c.extra_inlined_arguments || []
+        has_arguments?: !c.children[:arguments].empty?,
+        has_annotation?: !c.children[:annotation].nil?,
+        in_actionword?: c.parent.is_a?(Hiptest::Nodes::Actionword),
+        in_datatabled_scenario?: c.parent.is_a?(Hiptest::Nodes::Scenario) && has_datasets?(c.parent),
+        chunks: c.chunks || [],
+        extra_inlined_arguments: c.extra_inlined_arguments || []
       }
     end
 
     def walk_ifthen(it)
       {
-        :has_else? => !it.children[:else].empty?
+        has_else?: !it.children[:else].empty?
       }
     end
 
     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?
+        is_free_text?: p.free_text?,
+        is_datatable?: p.datatable?,
+        is_bool?: p.children[:type] == :bool,
+        has_default_value?: !p.children[:default].nil?
       }
     end
 
     def walk_tag(t)
       {
-        :has_value? => !t.children[:value].nil?
+        has_value?: !t.children[:value].nil?
       }
     end
 
     def walk_template(t)
       treated = t.children[:chunks].map do |chunk|
         {
-          :is_variable? => chunk.is_a?(Hiptest::Nodes::Variable),
-          :raw => chunk
+          is_variable?: chunk.is_a?(Hiptest::Nodes::Variable),
+          raw: chunk
         }
       end
       variable_names = treated.map {|item| item[:raw].children[:name] if item[:is_variable?]}.compact
 
       {
-        :treated_chunks => treated,
-        :variable_names => variable_names
+        treated_chunks: treated,
+        variable_names: variable_names
       }
     end
 

data/lib/templates/gherkin/_scenario.hbs

@@ -1,6 +1,6 @@
 {{#if has_datasets?}}
 {{#if has_tags?}}{{join rendered_children.tags ' '}}
-{{/if}}Scenario Outline: {{{ rendered_children.name }}}{{#if context.uids}}{{#if rendered_children.uid}} (uid:{{{rendered_children.uid}}}){{/if}}{{/if}}{{#indent}}
+{{/if}}{{> scenario_outline_title}}{{#indent}}
 {{#if has_description?}}{{#comment '#'}}{{rendered_children.description}}{{/comment}}
 {{/if}}{{#each rendered_children.body}}{{{ this }}}
 {{/each}}

data/lib/templates/gherkin/_scenario_outline_title.hbs

@@ -0,0 +1 @@
+Scenario Outline: {{{ rendered_children.name }}}{{#if context.uids}}{{#if rendered_children.uid}} (uid:{{{rendered_children.uid}}}){{/if}}{{/if}}

data/lib/templates/gherkin/inlined_uids/_scenario_outline_title.hbs

@@ -0,0 +1 @@
+Scenario Outline: {{{ rendered_children.name }}}{{#if context.uids}} (<hiptest-uid>){{/if}}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiptest-publisher
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.10.2
 platform: ruby
 authors:
 - Hiptest R&D
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-05 00:00:00.000000000 Z
+date: 2017-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -336,11 +336,13 @@ files:
 - lib/templates/cucumber/parameter.hbs
 - lib/templates/gherkin/_gherkin_text.hbs
 - lib/templates/gherkin/_scenario.hbs
+- lib/templates/gherkin/_scenario_outline_title.hbs
 - lib/templates/gherkin/argument.hbs
 - lib/templates/gherkin/call.hbs
 - lib/templates/gherkin/dataset.hbs
 - lib/templates/gherkin/datatable.hbs
 - lib/templates/gherkin/folder.hbs
+- lib/templates/gherkin/inlined_uids/_scenario_outline_title.hbs
 - lib/templates/gherkin/java/single_scenario.hbs
 - lib/templates/gherkin/parameter.hbs
 - lib/templates/gherkin/scenarios.hbs
@@ -628,7 +630,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Export your tests from Hiptest into executable tests.