hiptest-publisher 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9917743576cd4e61c3005e0a9535b676bdaa3e8
-  data.tar.gz: ae0187d7a2438b75d5369d0231e66bae458c7c00
+  metadata.gz: f62cf6aaf55b81aad2d311374fc50eee0f21ae64
+  data.tar.gz: 9ccd226707291c53a08a1adb56a36b1faa08c3fb
 SHA512:
-  metadata.gz: 76bca6131d95f2302981d3bf6c0c74ee9d17f34bad68a369b37eb60a583b9e4132d332c6d8cb4283d180f844131e1b023829ae723e03c81250caff9ef47b2eaf
-  data.tar.gz: c087c267d1084c11240bb4976a0c11bb36c2ace85cb1aa9897afaa33640d8b1d29a99cdd9aed1ba536702af793e305d1ece4058e51a22039b16e93e5496915d4
+  metadata.gz: dd59e98723dce31fd67a3e9e3af79ef57a0606d35a897aa73fc30664c6be1829a5e0641d3bf9c976e7ed9dc1171caab072e7f9bbad63a4fd482e503d16fc2b17
+  data.tar.gz: b42c26037f100b8984c4fb9c074ce0bce6d15bde8d11a7419c6a4b95c9f6af1cc49e73bbb486ca98ca54b4393739b4ef26f54d889b790d3f6b8b55d83cb1615c

data/README.md

@@ -56,6 +56,7 @@ Specific options:
     -f, --framework=FRAMEWORK        Test framework to use
     -o, --output-directory=PATH      Output directory (default: .)
     -c, --config-file=PATH           Configuration file (default: config)
+        --test-run-id=ID             Export data from a test run
         --scenario-ids=IDS           Filter scenarios by ids
         --scenario-tags=TAGS         Filter scenarios by tags
         --tests-only                 Export only the tests (default: false)
@@ -63,6 +64,7 @@ Specific options:
         --split-scenarios            Export each scenario in a single file (default: false)
         --leafless-export            Use only last level action word (default: false)
     -s, --site=SITE                  Site to fetch from (default: https://hiptest.net)
+    -p, --push=FILE.TAP              Push a results file to the server
     -v, --verbose                    Run verbosely (default: false)
     -H, --languages-help             Show languages and framework options
     -F, --filters-help               Show help about scenario filtering

data/lib/hiptest-publisher.rb

@@ -13,6 +13,11 @@ module Hiptest
     def initialize(args)
       @options = OptionsParser.parse(args)
 
+      unless @options.push.nil? || @options.push.empty?
+        post_results
+        return
+      end
+
       xml = fetch_xml_file
       return if xml.nil?
 
@@ -106,6 +111,8 @@ module Hiptest
     end
 
     def export
+      return if @project.nil?
+
       @language_config = LanguageConfigParser.new(@options)
       Hiptest::Nodes::ParentAdder.add(@project)
       Hiptest::Nodes::ParameterTypeAdder.add(@project)
@@ -117,5 +124,18 @@ module Hiptest
 
       export_actionwords unless @options.tests_only
     end
+
+    def post_results
+      status_message = "Posting #{@options.push} to #{@options.site}"
+      show_status_message(status_message)
+
+      begin
+        push_results(@options)
+        show_status_message(status_message, :success)
+      rescue Exception => err
+        show_status_message(status_message, :failure)
+        trace_exception(err) if @options.verbose
+      end
+    end
   end
 end

data/lib/hiptest-publisher/nodes.rb

@@ -233,6 +233,9 @@ module Hiptest
     end
 
     class Actionword < Item
+      def must_be_implemented?
+        @children[:body].empty? || @children[:body].map {|step| step.class}.compact.include?(Hiptest::Nodes::Step)
+      end
     end
 
     class Scenario < Item
@@ -245,6 +248,10 @@ module Hiptest
 
         @folder_uid = folder_uid
       end
+
+      def set_uid(uid)
+        @children[:uid] = uid
+      end
     end
 
     class Test < Node
@@ -279,12 +286,32 @@ module Hiptest
           :arguments => arguments
         }
       end
+
+      def set_uid(uid)
+        @children[:uid] = uid
+      end
     end
 
     class Actionwords < Node
+      attr_reader :to_implement, :no_implement
       def initialize(actionwords = [])
         super()
         @children = {:actionwords => actionwords}
+        mark_actionwords_for_implementation
+      end
+
+      private
+      def mark_actionwords_for_implementation
+        @to_implement = []
+        @no_implement = []
+
+        @children[:actionwords].each do |aw|
+          if aw.must_be_implemented?
+            @to_implement << aw
+          else
+            @no_implement << aw
+          end
+        end
       end
     end
 

data/lib/hiptest-publisher/options_parser.rb

@@ -75,6 +75,7 @@ class OptionsParser
       Option.new('f', 'framework=FRAMEWORK', '', String, "Test framework to use", :framework),
       Option.new('o', 'output-directory=PATH', '.', String, "Output directory", :output_directory),
       Option.new('c', 'config-file=PATH', 'config', String, "Configuration file", :config),
+      Option.new(nil, 'test-run-id=ID', '', String, "Export data from a test run", :test_run_id),
       Option.new(nil, 'scenario-ids=IDS', '', String, "Filter scenarios by ids", :filter_ids),
       Option.new(nil, 'scenario-tags=TAGS', '', String, "Filter scenarios by tags", :filter_tags),
       Option.new(nil, 'tests-only', false, nil, "Export only the tests", :tests_only),
@@ -82,6 +83,7 @@ class OptionsParser
       Option.new(nil, 'split-scenarios', false, nil, "Export each scenario in a single file", :split_scenarios),
       Option.new(nil, 'leafless-export', false, nil, "Use only last level action word", :leafless_export),
       Option.new('s', 'site=SITE', 'https://hiptest.net', String, "Site to fetch from", :site),
+      Option.new('p', 'push=FILE.TAP', '', String, "Push a results file to the server", :push),
       Option.new('v', 'verbose', false, nil, "Run verbosely", :verbose)
     ]
   end

data/lib/hiptest-publisher/utils.rb

@@ -1,6 +1,7 @@
 require 'open-uri'
 require 'openssl'
 require 'colorize'
+require 'net/http/post/multipart'
 
 def hiptest_publisher_path
   Gem.loaded_specs['hiptest-publisher'].full_gem_path
@@ -17,7 +18,12 @@ def make_filter(options)
 end
 
 def fetch_project_export(options)
-  url = "#{options.site}/publication/#{options.token}/#{options.leafless_export ? 'leafless_tests' : 'project'}?future=1#{make_filter(options)}"
+  url = "#{options.site}/publication/#{options.token}"
+  if options.test_run_id.nil? || options.test_run_id.empty?
+    url = "#{url}/#{options.leafless_export ? 'leafless_tests' : 'project'}?future=1#{make_filter(options)}"
+  else
+    url = "#{url}/test_run/#{options.test_run_id}"
+  end
 
   puts "URL: #{url}".white if options.verbose
   open(url, :ssl_verify_mode => OpenSSL::SSL::VERIFY_NONE)
@@ -44,4 +50,22 @@ def show_status_message(message, status=nil)
   end
 
   output.print "[#{status_icon}] #{message}\r#{line_end}"
+end
+
+def make_push_url(options)
+  "#{options.site}/import_test_results/#{options.token}/tap"
+end
+
+def push_results(options)
+  # Code from: https://github.com/nicksieger/multipart-posthttps://github.com/nicksieger/multipart-post
+  url = URI.parse(make_push_url(options))
+  use_ssl = make_push_url(options).start_with?('https://')
+
+  File.open(options.push) do |results|
+    req = Net::HTTP::Post::Multipart.new(url.path, "file" => UploadIO.new(results, "text", "results.tap"))
+
+    response = Net::HTTP.start(url.host, url.port, :use_ssl => use_ssl) do |http|
+      http.request(req)
+    end
+  end
 end

data/lib/hiptest-publisher/xml_parser.rb

@@ -180,21 +180,39 @@ module Hiptest
 
     def build_actionword(actionword)
       Hiptest::Nodes::Actionword.new(
-        css_first_content(actionword, 'name'),
+        css_first_content(actionword, '> name'),
         build_tags(actionword),
         build_parameters(actionword),
         build_steps(actionword))
     end
+    alias :build_actionwordSnapshot :build_actionword
 
     def build_scenario(scenario)
       Hiptest::Nodes::Scenario.new(
-        css_first_content(scenario, 'name'),
-        css_first_content(scenario, 'description'),
+        css_first_content(scenario, '> name'),
+        css_first_content(scenario, '> description'),
         build_tags(scenario),
         build_parameters(scenario),
         build_steps(scenario),
-        css_first_content(scenario, 'folderUid'),
-        build_node(css_first(scenario, 'datatable'), Hiptest::Nodes::Datatable))
+        css_first_content(scenario, '> folderUid'),
+        build_node(css_first(scenario, '> datatable'), Hiptest::Nodes::Datatable))
+    end
+
+    def build_scenarioSnapshot(scs)
+      scenario = build_scenario(scs)
+      datasets = scenario.find_sub_nodes(Hiptest::Nodes::Dataset)
+
+      if datasets.empty?
+        scenario.set_uid(css_first_content(scs, 'testSnapshot > uid'))
+      else
+        scs.css('testSnapshot').each do |testSnapshot|
+          uid = css_first_content(testSnapshot, '> uid')
+          index = css_first_content(testSnapshot, '> index').to_i
+
+          datasets[index].set_uid(uid) unless index >= datasets.length
+        end
+      end
+      scenario
     end
 
     def build_datatable(datatable)
@@ -207,12 +225,20 @@ module Hiptest
         build_node_list(dataset.css('> arguments argument')))
     end
 
-    def build_actionwords(actionwords)
-      build_node_list(actionwords.css('> actionword'), Hiptest::Nodes::Actionwords)
+    def build_actionwords(actionwords, actionwords_query = '> actionword')
+      build_node_list(actionwords.css(actionwords_query), Hiptest::Nodes::Actionwords)
+    end
+
+    def build_actionwordSnapshots(actionword_snapshots)
+      build_actionwords(actionword_snapshots, '> actionwordSnapshot')
     end
 
-    def build_scenarios(scenarios)
-      build_node_list(scenarios.css('> scenario'), Hiptest::Nodes::Scenarios)
+    def build_scenarios(scenarios, scenarios_query = '> scenario')
+      build_node_list(scenarios.css(scenarios_query), Hiptest::Nodes::Scenarios)
+    end
+
+    def build_scenarioSnapshots(scenario_snapshots)
+      build_scenarios(scenario_snapshots, '> scenarioSnapshot')
     end
 
     def build_tests(tests)
@@ -234,24 +260,40 @@ module Hiptest
         css_first_content(folder, 'parentUid'),
         css_first_content(folder, 'name'))
     end
+    alias :build_folderSnapshot :build_folder
 
-    def build_testPlan(test_plan)
+    def build_testPlan(test_plan, folders_query = '> folder')
       tp = Hiptest::Nodes::TestPlan.new(
-        build_node_list(test_plan.css('> folder')))
+        build_node_list(test_plan.css(folders_query)))
 
       tp.organize_folders
       return tp
     end
 
+    def build_folderSnapshots(folder_snapshots)
+      build_testPlan(folder_snapshots, '> folderSnapshot')
+    end
+
     def build_project
       project = css_first(@xml, 'project')
+      test_run = css_first(project, '> testRuns > testRun')
+
+      if test_run.nil?
+        test_plan_node = css_first(project, '> testPlan')
+        scenarios_node = css_first(project, '> scenarios')
+        actionwords_node = css_first(project, '> actionwords')
+      else
+        test_plan_node = css_first(test_run, '> folderSnapshots')
+        scenarios_node = css_first(test_run, '> scenarioSnapshots')
+        actionwords_node = css_first(test_run, '> actionwordSnapshots')
+      end
 
       @project = Hiptest::Nodes::Project.new(
         css_first_content(project, '> name'),
         css_first_content(project, '> description'),
-        build_node(css_first(project, '> testPlan'), Hiptest::Nodes::TestPlan),
-        build_node(css_first(project, '> scenarios'), Hiptest::Nodes::Scenarios),
-        build_node(css_first(project, '> actionwords'), Hiptest::Nodes::Actionwords),
+        build_node(test_plan_node, Hiptest::Nodes::TestPlan),
+        build_node(scenarios_node, Hiptest::Nodes::Scenarios),
+        build_node(actionwords_node, Hiptest::Nodes::Actionwords),
         build_node(css_first(project, '> tests'), Hiptest::Nodes::Tests))
 
       @project.assign_scenarios_to_folders

data/lib/templates/java/_scenario.hbs

@@ -3,5 +3,5 @@
 {{else}}{{#comment '//'}}{{{ rendered_children.description }}}
 {{#if has_tags?}}Tags: {{{ join rendered_children.tags ' '}}}{{/if}}
 {{/comment}}
-public void test{{{ camelize rendered_children.name }}}() {{#curly}}{{> body}}
+public void test{{{ camelize rendered_children.name }}}{{#if rendered_children.uid}}Uid{{{ normalize rendered_children.uid}}}{{/if}}() {{#curly}}{{> body}}
 {{/curly}}{{/if}}

data/lib/templates/java/dataset.hbs

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

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

@@ -4,5 +4,5 @@
 {{#if has_tags?}}Tags: {{{ join rendered_children.tags ' '}}}{{/if}}
 {{/comment}}
 @Test
-public void {{{ camelize_lower rendered_children.name }}}() {{#curly}}{{> body}}
+public void {{{ camelize_lower rendered_children.name }}}{{#if rendered_children.uid}}Uid{{{ normalize rendered_children.uid}}}{{/if}}() {{#curly}}{{> body}}
 {{/curly}}{{/if}}

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

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

data/lib/templates/python/_scenario.hbs

@@ -1,4 +1,4 @@
 {{#if has_datasets?}}{{> item_as_def}}
 {{{ rendered_children.datatable }}}
-{{else}}def test_{{{ normalize rendered_children.name }}}({{> parameters}}):
+{{else}}def test_{{{ normalize rendered_children.name }}}{{#if rendered_children.uid}}_uid{{{ normalize rendered_children.uid}}}{{/if}}({{> parameters}}):
 {{> body}}{{/if}}

data/lib/templates/python/dataset.hbs

@@ -1,2 +1,2 @@
-def test_{{{ normalize scenario_name}}}_{{{ normalize_lower rendered_children.name}}}(self):
+def test_{{{ normalize scenario_name}}}_{{{ normalize_lower rendered_children.name}}}{{#if rendered_children.uid}}_uid{{{ normalize rendered_children.uid}}}{{/if}}(self):
     self.{{{ underscore scenario_name }}}({{{ join rendered_children.arguments ', ' }}})

data/lib/templates/robotframework/_keyword.hbs

@@ -1,4 +1,4 @@
-{{{ underscore rendered_children.name }}}{{#indent}}
+{{{ underscore rendered_children.name }}}{{#if rendered_children.uid}}_uid{{{ normalize rendered_children.uid}}}{{/if}}{{#indent}}
 {{#if has_parameters?}}[Arguments]{{{ tab }}}{{{ join rendered_children.parameters "\t"}}}
 {{/if}}{{#each rendered_children.body}}{{{ this }}}
 {{/each}}{{/indent}}

data/lib/templates/robotframework/dataset.hbs

@@ -1 +1 @@
-{{{ rendered_children.name}}}{{{ tab }}}{{{ join rendered_children.arguments '\t'}}}
+{{{ rendered_children.name}}}{{#if rendered_children.uid}} (uid:{{{rendered_children.uid}}}){{/if}}{{{ tab }}}{{{ join rendered_children.arguments '\t'}}}

data/lib/templates/ruby/_scenario.hbs

@@ -1,5 +1,5 @@
 {{#if has_datasets?}}context "{{{ remove_quotes rendered_children.name }}}" do{{#indent}}
 {{> item_as_def}}
-{{{ rendered_children.datatable }}}{{/indent}}{{else}}it "{{{ remove_quotes rendered_children.name }}}" do
+{{{ rendered_children.datatable }}}{{/indent}}{{else}}it "{{{ remove_quotes rendered_children.name }}}{{#if rendered_children.uid}} (uid:{{{rendered_children.uid}}}){{/if}}" do
 {{> body}}{{/if}}
 end

data/lib/templates/ruby/dataset.hbs

@@ -1,3 +1,3 @@
-it "{{{remove_quotes rendered_children.name}}}" do
+it "{{{remove_quotes rendered_children.name}}}{{#if rendered_children.uid}} (uid:{{{rendered_children.uid}}}){{/if}}" do
   {{{ underscore scenario_name }}}({{{ join rendered_children.arguments ', ' }}})
 end

data/lib/templates/ruby/minitest/_scenario.hbs

@@ -1,4 +1,4 @@
 {{#if has_datasets?}}{{> item_as_def}}
-{{{ rendered_children.datatable }}}{{else}}def test_{{{ normalize rendered_children.name }}}
+{{{ rendered_children.datatable }}}{{else}}def test_{{{ normalize rendered_children.name }}}{{#if rendered_children.uid}}_uid{{{ normalize rendered_children.uid}}}{{/if}}
 {{> body}}
 end{{/if}}

data/lib/templates/ruby/minitest/dataset.hbs

@@ -1,3 +1,3 @@
-def test_{{{ normalize scenario_name}}}_{{{ normalize_lower rendered_children.name}}}
+def test_{{{ normalize scenario_name}}}_{{{ normalize_lower rendered_children.name}}}{{#if rendered_children.uid}}_uid{{{ normalize rendered_children.uid}}}{{/if}}
   {{{ underscore scenario_name }}}({{{ join rendered_children.arguments ', ' }}})
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiptest-publisher
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Hiptest R&D
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-26 00:00:00.000000000 Z
+date: 2015-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -110,6 +110,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: multipart-post
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -397,7 +411,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Export your tests from Hiptest into executable tests.