hiptest-publisher 0.5.10 → 0.6.0

data/lib/hiptest-publisher/parent_adder.rb

@@ -10,9 +10,9 @@ module Hiptest
         return unless node.is_a? Hiptest::Nodes::Node
 
         node.direct_children.each {|child|
-          child.parent = node
+          child.parent ||= node
         }
       end
     end
   end
-end
+end

data/lib/hiptest-publisher/renderer.rb

@@ -10,9 +10,7 @@ module Hiptest
     attr_reader :rendered
     include RenderContextMaker
 
-    def self.render(node, language, context)
-      context[:language] = language
-
+    def self.render(node, context)
       renderer = Hiptest::Renderer.new(context)
       renderer.walk_node(node)
       renderer.rendered[node]
@@ -22,11 +20,7 @@ module Hiptest
       super(:children_first)
       @rendered = {}
       @context = context
-      @handlebars = Handlebars::Handlebars.new
-      @compiled_handlebars = {}
-      register_partials()
-
-      Hiptest::HandlebarsHelper.register_helpers(@handlebars, @context)
+      @template_finder = context.template_finder
     end
 
     def call_node_walker(node)
@@ -41,71 +35,26 @@ module Hiptest
       end
     end
 
-    def searched_folders()
-      folders = []
-      if @context.has_key?(:framework)
-        folders << "#{@context[:language]}/#{@context[:framework]}"
-      end
-      folders << [@context[:language], 'common']
-      folders = folders.flatten.map {|path| "#{hiptest_publisher_path}/lib/templates/#{path}"}
-
-      if @context.has_key?(:overriden_templates)
-        folders = folders.insert(0, @context[:overriden_templates])
-      end
-      return folders
-    end
-
-    def register_partials()
-      searched_folders.reverse.each do |path|
-        next unless File.directory?(path)
-        Dir.entries(path).select do |file_name|
-          file_path = File.join(path, file_name)
-          next unless File.file?(file_path) && file_name.start_with?('_')
-          @handlebars.register_partial(file_name[1..-5], File.read(file_path))
-        end
-      end
-    end
-
     def render_node(node, render_context)
-      render_context = {} if render_context.nil?
+      render_context ||= {}
       render_context[:node] = node
       render_context[:rendered_children] = @rendered_children
       render_context[:context] = @context
 
-      template = get_template_path(node)
+      template = @template_finder.get_template_path(normalized_name(node))
       if template
-        get_compiled_handlebars(template).call(render_context)
+        @template_finder.get_compiled_handlebars(template).call(render_context)
       else
         raise ArgumentError.new("no template for node #{node.class}")
       end
     end
 
-    def get_compiled_handlebars(template)
-      @compiled_handlebars[template] ||= @handlebars.compile(File.read(template))
-    end
-
-    def get_template_by_name(name, extension)
-      searched_folders.map do |path|
-        template_path = File.join(path, "#{name}.#{extension}")
-        template_path if File.file?(template_path)
-      end.compact.first
-    end
-
-    def fallback_template(extension)
-      @fallback_template ||= begin
-        if @context[:fallback_template]
-          get_template_by_name(@context[:fallback_template], extension)
-        end
-      end
-    end
-
-    def get_template_path(node, extension = 'hbs')
+    def normalized_name(node)
       normalized_name = node.class.name.split('::').last.downcase
       unless @context[:forced_templates][normalized_name].nil?
         normalized_name = @context[:forced_templates][normalized_name]
       end
-
-      get_template_by_name(normalized_name, extension) || fallback_template(extension)
+      normalized_name
     end
   end
 end

data/lib/hiptest-publisher/utils.rb

@@ -24,6 +24,10 @@ def pluralize(count, singular)
   "#{count} #{word}"
 end
 
+def singularize(name)
+  name.to_s.chomp("s")
+end
+
 def make_filter(options)
   ids = options.filter_ids.split(',').map {|id| "filter[]=id:#{id}"}
   tags = options.filter_tags.split(',').map {|tag| "filter[]=tag:#{tag}"}
@@ -41,7 +45,7 @@ def fetch_project_export(options)
   end
 
   puts "URL: #{url}".white if options.verbose
-  open(url, :ssl_verify_mode => OpenSSL::SSL::VERIFY_NONE)
+  open(url, "User-Agent" => 'Ruby/hiptest-publisher', :ssl_verify_mode => OpenSSL::SSL::VERIFY_NONE)
 end
 
 def show_status_message(message, status=nil)

data/lib/hiptest-publisher/xml_parser.rb

@@ -271,7 +271,8 @@ module Hiptest
       Hiptest::Nodes::Folder.new(
         css_first_content(folder, 'uid'),
         css_first_content(folder, 'parentUid'),
-        css_first_content(folder, 'name'))
+        css_first_content(folder, 'name'),
+        css_first_content(folder, 'description'))
     end
     alias :build_folderSnapshot :build_folder
 

data/lib/templates/cucumber/folders_as_features/folder.hbs

@@ -0,0 +1,4 @@
+Feature: {{{ rendered_children.name }}}{{#indent}}
+{{#if rendered_children.description}}{{#indent}}{{rendered_children.description}}{{/indent}}{{/if}}
+{{#each rendered_children.scenarios}}{{{this}}}{{/each}}
+{{/indent}}

data/lib/templates/cucumber/folders_as_features/single_scenario.hbs

@@ -0,0 +1,14 @@
+{{#if has_datasets?}}
+Scenario Outline: {{{ rendered_children.name }}}{{#indent}}
+{{#each rendered_children.body}}{{{ this }}}
+{{/each}}
+Examples:{{#indent}}
+| {{ join rendered_children.parameters ' | ' }} | hiptest-uid |
+{{{rendered_children.datatable}}}
+{{/indent}}{{/indent}}
+{{else}}
+Scenario: {{{ rendered_children.name }}}{{#if rendered_children.uid}} (uid:{{{rendered_children.uid}}}){{/if}}{{#indent}}
+{{#each rendered_children.body}}{{{ this }}}
+{{/each}}
+{{/indent}}
+{{/if}}

data/lib/templates/java/dataset.hbs

@@ -1,3 +1,3 @@
 public void test{{{ camelize scenario_name}}}{{{ camelize rendered_children.name}}}{{#if rendered_children.uid}}Uid{{{ normalize rendered_children.uid}}}{{/if}}() {{#curly}}
-  {{{ camelize_lower scenario_name }}}({{{ join rendered_children.arguments ', '}}});
+{{#indent}}{{{ camelize_lower scenario_name }}}({{{ join rendered_children.arguments ', '}}});{{/indent}}
 {{/curly}}

data/lib/templates/java/scenarios.hbs

@@ -3,9 +3,9 @@ package {{{ context.package }}};
 import junit.framework.TestCase;
 
 public class {{{ clear_extension context.filename }}} extends TestCase {{#curly}}
-
-  public Actionwords {{{ context.call_prefix }}} = new Actionwords();
-{{#indent}}{{#each rendered_children.scenarios}}{{{this}}}
+{{#indent}}
+public Actionwords {{{ context.call_prefix }}} = new Actionwords();
+{{#each rendered_children.scenarios}}{{{this}}}
 {{/each}}
 {{/indent}}
 {{/curly}}

data/lib/templates/java/single_scenario.hbs

@@ -2,10 +2,10 @@ package {{{ context.package }}};
 
 import junit.framework.TestCase;
 
-public class {{{ clear_extension context.test_file_name }}} extends TestCase {{#curly}}
-
-  public Actionwords {{{ context.call_prefix }}} = new Actionwords();
+public class {{{ clear_extension context.filename }}} extends TestCase {{#curly}}
 {{#indent}}
+public Actionwords {{{ context.call_prefix }}} = new Actionwords();
+
 {{> scenario}}
 {{/indent}}
 {{/curly}}

data/lib/templates/java/single_test.hbs

@@ -2,10 +2,10 @@ package {{{ context.package }}};
 
 import junit.framework.TestCase;
 
-public class {{{ clear_extension context.test_file_name }}} extends TestCase {{#curly}}
-
-  public Actionwords {{{ context.call_prefix }}} = new Actionwords();
+public class {{{ clear_extension context.filename }}} extends TestCase {{#curly}}
 {{#indent}}
+public Actionwords {{{ context.call_prefix }}} = new Actionwords();
+
 {{> scenario}}
 {{/indent}}
 {{/curly}}

data/lib/templates/java/testng/dataset.hbs

@@ -1,4 +1,4 @@
 @Test
 public void {{{ camelize_lower scenario_name}}}{{{ camelize rendered_children.name}}}{{#if rendered_children.uid}}Uid{{{ normalize rendered_children.uid}}}{{/if}}() {{#curly}}
-  {{{ camelize_lower scenario_name }}}({{{ join rendered_children.arguments ', '}}});
+{{#indent}}{{{ camelize_lower scenario_name }}}({{{ join rendered_children.arguments ', '}}});{{/indent}}
 {{/curly}}

data/lib/templates/java/testng/single_scenario.hbs

@@ -2,10 +2,10 @@ package {{{ context.package }}};
 
 import org.testng.annotations.*;
 
-public class {{{ clear_extension context.test_file_name }}} {{#curly}}
-
-  public Actionwords {{{ context.call_prefix }}} = new Actionwords();
+public class {{{ clear_extension context.filename }}} {{#curly}}
 {{#indent}}
+public Actionwords {{{ context.call_prefix }}} = new Actionwords();
+
 {{> scenario}}
 {{/indent}}
 {{/curly}}

data/lib/templates/java/testng/single_test.hbs

@@ -2,10 +2,10 @@ package {{{ context.package }}};
 
 import org.testng.annotations.*;
 
-public class {{{ clear_extension context.test_file_name }}} {{#curly}}
-
-  public Actionwords {{{ context.call_prefix }}} = new Actionwords();
+public class {{{ clear_extension context.filename }}} {{#curly}}
 {{#indent}}
+public Actionwords {{{ context.call_prefix }}} = new Actionwords();
+
 {{> scenario}}
 {{/indent}}
 {{/curly}}

data/lib/templates/java/tests.hbs

@@ -3,9 +3,9 @@ package {{{ context.package }}};
 import junit.framework.TestCase;
 
 public class {{{ clear_extension context.filename }}} extends TestCase {{#curly}}
-
-  public Actionwords {{{ context.call_prefix }}} = new Actionwords();
-{{#indent}}{{#each rendered_children.tests}}{{{this}}}
+{{#indent}}
+public Actionwords {{{ context.call_prefix }}} = new Actionwords();
+{{#each rendered_children.tests}}{{{this}}}
 {{/each}}
 {{/indent}}
 {{/curly}}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiptest-publisher
 version: !ruby/object:Gem::Version
-  version: 0.5.10
+  version: 0.6.0
 platform: ruby
 authors:
 - Hiptest R&D
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-11 00:00:00.000000000 Z
+date: 2015-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -239,9 +239,20 @@ extra_rdoc_files:
 files:
 - README.md
 - bin/hiptest-publisher
+- lib/config/cucumber-folders_as_features.conf
+- lib/config/cucumber.conf
+- lib/config/java.conf
+- lib/config/javascript-jasmine.conf
+- lib/config/javascript.conf
+- lib/config/python.conf
+- lib/config/robotframework.conf
+- lib/config/ruby-minitest.conf
+- lib/config/ruby.conf
+- lib/config/seleniumide.conf
 - lib/hiptest-publisher.rb
 - lib/hiptest-publisher/actionword_indexer.rb
 - lib/hiptest-publisher/call_arguments_adder.rb
+- lib/hiptest-publisher/cli_options_checker.rb
 - lib/hiptest-publisher/formatters/console_formatter.rb
 - lib/hiptest-publisher/formatters/reporter.rb
 - lib/hiptest-publisher/gherkin_adder.rb
@@ -272,7 +283,8 @@ files:
 - lib/templates/cucumber/dataset.hbs
 - lib/templates/cucumber/datatable.hbs
 - lib/templates/cucumber/empty.hbs
-- lib/templates/cucumber/output_config
+- lib/templates/cucumber/folders_as_features/folder.hbs
+- lib/templates/cucumber/folders_as_features/single_scenario.hbs
 - lib/templates/cucumber/parameter.hbs
 - lib/templates/cucumber/scenarios.hbs
 - lib/templates/cucumber/single_scenario.hbs
@@ -296,7 +308,6 @@ files:
 - lib/templates/java/index.hbs
 - lib/templates/java/list.hbs
 - lib/templates/java/nullliteral.hbs
-- lib/templates/java/output_config
 - lib/templates/java/parameter.hbs
 - lib/templates/java/parenthesis.hbs
 - lib/templates/java/property.hbs
@@ -338,14 +349,12 @@ files:
 - lib/templates/javascript/jasmine/_before_each.hbs
 - lib/templates/javascript/jasmine/_scenario.hbs
 - lib/templates/javascript/jasmine/dataset.hbs
-- lib/templates/javascript/jasmine/output_config
 - lib/templates/javascript/jasmine/scenarios.hbs
 - lib/templates/javascript/jasmine/single_scenario.hbs
 - lib/templates/javascript/jasmine/single_test.hbs
 - lib/templates/javascript/jasmine/tests.hbs
 - lib/templates/javascript/list.hbs
 - lib/templates/javascript/nullliteral.hbs
-- lib/templates/javascript/output_config
 - lib/templates/javascript/parameter.hbs
 - lib/templates/javascript/parenthesis.hbs
 - lib/templates/javascript/project.hbs
@@ -378,7 +387,6 @@ files:
 - lib/templates/python/index.hbs
 - lib/templates/python/list.hbs
 - lib/templates/python/nullliteral.hbs
-- lib/templates/python/output_config
 - lib/templates/python/parameter.hbs
 - lib/templates/python/parenthesis.hbs
 - lib/templates/python/project.hbs
@@ -410,7 +418,6 @@ files:
 - lib/templates/robotframework/index.hbs
 - lib/templates/robotframework/list.hbs
 - lib/templates/robotframework/nullliteral.hbs
-- lib/templates/robotframework/output_config
 - lib/templates/robotframework/parameter.hbs
 - lib/templates/robotframework/parenthesis.hbs
 - lib/templates/robotframework/project.hbs
@@ -446,14 +453,12 @@ files:
 - lib/templates/ruby/minitest/_item_as_def.hbs
 - lib/templates/ruby/minitest/_scenario.hbs
 - lib/templates/ruby/minitest/dataset.hbs
-- lib/templates/ruby/minitest/output_config
 - lib/templates/ruby/minitest/scenario.hbs
 - lib/templates/ruby/minitest/scenarios.hbs
 - lib/templates/ruby/minitest/single_scenario.hbs
 - lib/templates/ruby/minitest/single_test.hbs
 - lib/templates/ruby/minitest/test.hbs
 - lib/templates/ruby/minitest/tests.hbs
-- lib/templates/ruby/output_config
 - lib/templates/ruby/parameter.hbs
 - lib/templates/ruby/parenthesis.hbs
 - lib/templates/ruby/project.hbs
@@ -472,7 +477,6 @@ files:
 - lib/templates/seleniumide/argument.hbs
 - lib/templates/seleniumide/call.hbs
 - lib/templates/seleniumide/empty.hbs
-- lib/templates/seleniumide/output_config
 - lib/templates/seleniumide/single_test.hbs
 - lib/templates/seleniumide/step.hbs
 - lib/templates/seleniumide/stringliteral.hbs

data/lib/templates/cucumber/output_config

@@ -1,11 +0,0 @@
-[tests]
-filename = 'features.feature'
-scenario_filename = '%s.feature'
-indentation = "  "
-fallback_template = 'empty'
-
-[actionwords]
-filename = 'step_definitions.rb'
-indentation = "  "
-naming_convention = 'underscore'
-fallback_template = 'empty'