cukerail 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5bafd2e3713f9bc90f2555a9f01581df6ae2420
-  data.tar.gz: 78579041ab618d9b636639c374e7493b8ba2c843
+  metadata.gz: 7ca72a855beaf0eb171de4e43366674b7f75c5ad
+  data.tar.gz: 668ef187633fa78bd9d8b60dcad7faaa172def22
 SHA512:
-  metadata.gz: e01b06f772ded6ed2cc164b83a3fd31540b2d515ab76c06fa909775879ad81cb7ac768a073fe3e4bf6603939aba58d437924121600345b0e442035bac1188243
-  data.tar.gz: 4de9899654fe18a1dfa0f4d12265001a57d36f55f722a8cc99813e6130b2208c30a15a39a066d07806815430e07b8d870741b1f309c0732a05697269da1ee58e
+  metadata.gz: 4765e49ccbb33919ddec291081222f2692c193573e9473f2a72c6438264d399b74d0c30229f70cca29cf0b5cc8d79b23c187eb003ebaa0a72f83646313895141
+  data.tar.gz: fcabc83b418036dd731736aca67d65cb9146a3fd4c7ccdbdcdc5b7cadc13daf8ef2d28f11822098b16ac67485f80f320a88d08f95c97c87e45be6d4a19364091

data/lib/cukerail/version.rb

@@ -1,3 +1,3 @@
 module Cukerail
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/lib/cukerail.rb

@@ -20,7 +20,7 @@ module Cukerail
       raise 'No id found' unless @id
       send_steps(test_case,@id)
       if ENV['TESTRUN']
-        send_result(test_case,result,@id,ENV['TESTRUN']) 
+        send_result(test_case,result,@id,ENV['TESTRUN'].to_i) 
       end
     rescue StandardError => e
       puts "#{e.message} in #{extract_title(test_case)}"
@@ -189,28 +189,39 @@ module Cukerail
       all_tags(test_case).select{|tag| tag.name =~/jira_/}.map{|ticket| /jira_(\w+-\d+)$/.match(ticket.name)[1]}.join(" ")
     end
 
-    def update_run(testrun,case_ids)
+    def update_run(run_id,case_ids)
+      run = get_run(run_id)
       begin
-        testrail_api_client.send_post("update_run/#{testrun}",case_ids)
+        if run['plan_id']
+          update_plan(run['plan_id'],run_id,case_ids)
+        else
+          testrail_api_client.send_post("update_run/#{run_id}",case_ids)
+        end
       rescue => e
-        puts "#{e.message} testrun=#{testrun} test case ids=#{case_ids}"
+        puts "#{e.message} testrun=#{run_id} test case ids=#{case_ids}"
       end
     end
 
-    def remove_case_from_test_run(testcase,testrun)
+    def update_plan(plan_id,run_id,case_ids)
+      test_plan = testrail_api_client.send_get("get_plan/#{plan_id}")
+      entry_id = test_plan['entries'].detect{|e| e['runs'].any?{|r| r['id']==run_id}}['id']
+      testrail_api_client.send_post("update_plan_entry/#{plan_id}/#{entry_id}",case_ids)
+    end
+
+    def remove_case_from_test_run(testcase,run_id)
       testcase_id = get_id(testcase)
-      run = get_run(testrun)
+      run = get_run(run_id)
       unless run['include_all']
-        case_ids = get_tests_in_a_run(testrun).map{|h| h['case_id']} - [testcase_id]
-        update_run(testrun,{'case_ids'=>case_ids})
+        case_ids = get_tests_in_a_run(run_id).map{|h| h['case_id']} - [testcase_id]
+        update_run(run_id,{'case_ids'=>case_ids})
       end
     end
 
-    def add_case_to_test_run(testcase_id,testrun)
-      run = get_run(testrun)
+    def add_case_to_test_run(testcase_id,run_id)
+      run = get_run(run_id)
       unless run['include_all']
-        case_ids = get_tests_in_a_run(testrun).map{|h| h['case_id']} + [testcase_id]
-        update_run(testrun,{'case_ids'=>case_ids})
+        case_ids = get_tests_in_a_run(run_id).map{|h| h['case_id']} + [testcase_id]
+        update_run(run_id,{'case_ids'=>case_ids})
       end
     end
 

data/lib/json_sender.rb

@@ -3,6 +3,7 @@ require_relative "cukerail/testrail"
 require 'json' unless JSON 
 require 'awesome_print'
 module Cukerail
+
   class JsonSender
     attr_reader :testrail_api_client,:results
     def initialize(json_file)
@@ -80,7 +81,7 @@ module Cukerail
       end
     end
 
-    def send_result(scenario,id,testrun_id)
+    def send_result(scenario,id,run_id)
       error_line = scenario['steps'].select{|s| s['result']['status'] != 'passed'}.first 
       if error_line
         #puts error_line['result']
@@ -106,13 +107,13 @@ module Cukerail
       end
       report_on_result =  {status_id:testrail_status[:id],comment:failure_message,defects:defects(scenario)}
       begin
-        testrail_api_client.send_post("add_result_for_case/#{testrun_id}/#{id}",report_on_result)
+        testrail_api_client.send_post("add_result_for_case/#{run_id}/#{id}",report_on_result)
       rescue => e
         if e.message =~ /No \(active\) test found for the run\/case combination/
-          add_case_to_test_run(id,testrun_id)
+          add_case_to_test_run(id,run_id)
           retry
         else
-          puts "#{e.message} testrun=#{testrun_id} test case id=#{id}"
+          puts "#{e.message} testrun=#{run_id} test case id=#{id}"
         end
       end
     end
@@ -125,47 +126,47 @@ module Cukerail
       testrail_api_client.send_get("get_tests/#{run_id}")
     end
 
-    def update_run(testrun_id,case_ids)
-      run = get_run(testrun_id)
+    def update_run(run_id,case_ids)
+      run = get_run(run_id)
       begin
         if run['plan_id']
-          update_plan(run['plan_id'],testrun_id,case_ids)
+          update_plan(run['plan_id'],run_id,case_ids)
         else
-          testrail_api_client.send_post("update_run/#{testrun_id}",case_ids)
+          testrail_api_client.send_post("update_run/#{run_id}",case_ids)
         end
       rescue => e
-        puts "#{e.message} testrun=#{testrun_id} test case ids=#{case_ids}"
+        puts "#{e.message} testrun=#{run_id} test case ids=#{case_ids}"
       end
     end
 
-    def update_plan(plan_id,testrun_id,case_ids)
+    def update_plan(plan_id,run_id,case_ids)
       test_plan = testrail_api_client.send_get("get_plan/#{plan_id}")
-      entry_id = test_plan['entries'].select{|e| e['runs'].any?{|r| r['id']==testrun_id}}.first['id']
+      entry_id = test_plan['entries'].select{|e| e['runs'].any?{|r| r['id']==run_id}}.first['id']
       testrail_api_client.send_post("update_plan_entry/#{plan_id}/#{entry_id}",case_ids)
     end
 
-    def remove_case_from_test_run(testcase,testrun_id)
+    def remove_case_from_test_run(testcase,run_id)
       testcase_id = get_id(testcase)
-      run = get_run(testrun_id)
+      run = get_run(run_id)
       unless run['include_all']
-        case_ids = get_tests_in_a_run(testrun_id).map{|h| h['case_id']} - [testcase_id]
-        update_run(testrun_id,{'case_ids'=>case_ids})
+        case_ids = get_tests_in_a_run(run_id).map{|h| h['case_id']} - [testcase_id]
+        update_run(run_id,{'case_ids'=>case_ids})
       end
     end
 
-    def add_case_to_test_run(testcase_id,testrun_id)
-      run = get_run(testrun_id)
+    def add_case_to_test_run(testcase_id,run_id)
+      run = get_run(run_id)
       unless run['include_all']
-        case_ids = get_tests_in_a_run(testrun_id).map{|h| h['case_id']} + [testcase_id]
-        update_run(testrun_id,{'case_ids'=>case_ids})
+        case_ids = get_tests_in_a_run(run_id).map{|h| h['case_id']} + [testcase_id]
+        update_run(run_id,{'case_ids'=>case_ids})
       end
     end
 
-    def remove_all_except_these_cases_from_testrun(testcases,testrun_id)
-      run = get_run(testrun_id)
+    def remove_all_except_these_cases_from_testrun(testcases,run_id)
+      run = get_run(run_id)
       unless run['include_all']
-        case_ids = get_tests_in_a_run(testrun_id).map{|h| h['case_id']} & testcases
-        update_run(testrun,{'case_ids'=>case_ids})
+        case_ids = get_tests_in_a_run(run_id).map{|h| h['case_id']} & testcases
+        update_run(run_id,{'case_ids'=>case_ids})
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cukerail
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - John Small
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler