cukerail 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b831a4b870d9c07024277f6cb8e9b5251b41c40
-  data.tar.gz: 75d6bed3146b9a653d898cc708eac9a137e6517f
+  metadata.gz: e5bafd2e3713f9bc90f2555a9f01581df6ae2420
+  data.tar.gz: 78579041ab618d9b636639c374e7493b8ba2c843
 SHA512:
-  metadata.gz: 6406952e4048f47c1677160d029c202d2788f0b171d29a754600c11b993675e2e3884f7346e1960c822d6f295a513668c79d666fd356ac81361699f3e96e75bb
-  data.tar.gz: dd193e68dff1c5211f266fef9e097902f36613d2a16b3acc7898eee5df4fc72bfa5c3d7b9fc63f882246e08da8d29ebb6a68d93e8685350fce8f6f6341222363
+  metadata.gz: e01b06f772ded6ed2cc164b83a3fd31540b2d515ab76c06fa909775879ad81cb7ac768a073fe3e4bf6603939aba58d437924121600345b0e442035bac1188243
+  data.tar.gz: 4de9899654fe18a1dfa0f4d12265001a57d36f55f722a8cc99813e6130b2208c30a15a39a066d07806815430e07b8d870741b1f309c0732a05697269da1ee58e

data/lib/cukerail/version.rb

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

data/lib/json_sender.rb

@@ -76,14 +76,14 @@ module Cukerail
 
     def defects(scenario)
       if scenario['tags']
-        scenario['tags'].select{|t| t['name'] =~/@jira_/}.map{|t| /jira_(\w+-\w+)/.match(t['name'])}.join(' ')
+        scenario['tags'].select{|t| t['name'] =~/@jira_/}.map{|t| /jira_(\w+-\d+)/.match(t['name'])[1]}.join(' ')
       end
     end
 
-    def send_result(scenario,id,testrun)
+    def send_result(scenario,id,testrun_id)
       error_line = scenario['steps'].select{|s| s['result']['status'] != 'passed'}.first 
       if error_line
-        puts error_line['result']
+        #puts error_line['result']
         testrail_status = case error_line['result']['status']
                           when 'failed'
                             {id:5,comment: 'failed'}
@@ -106,37 +106,44 @@ 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}",report_on_result)
+        testrail_api_client.send_post("add_result_for_case/#{testrun_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)
+          add_case_to_test_run(id,testrun_id)
           retry
         else
-          puts "#{e.message} testrun=#{testrun} test case id=#{id}"
+          puts "#{e.message} testrun=#{testrun_id} test case id=#{id}"
         end
       end
     end
 
     def get_run(run_id)
-      @test_run ||= testrail_api_client.send_get("get_run/#{run_id}")
-      ap @test_run
-      puts "test plan = #{@test_run['plan_id']}"
-      @test_run
+      testrail_api_client.send_get("get_run/#{run_id}")
     end
 
     def get_tests_in_a_run(run_id)
-      @all_tests ||= testrail_api_client.send_get("get_tests/#{run_id}")
+      testrail_api_client.send_get("get_tests/#{run_id}")
     end
 
     def update_run(testrun_id,case_ids)
       run = get_run(testrun_id)
       begin
-        testrail_api_client.send_post("update_run/#{testrun_id}",case_ids)
+        if run['plan_id']
+          update_plan(run['plan_id'],testrun_id,case_ids)
+        else
+          testrail_api_client.send_post("update_run/#{testrun_id}",case_ids)
+        end
       rescue => e
         puts "#{e.message} testrun=#{testrun_id} test case ids=#{case_ids}"
       end
     end
 
+    def update_plan(plan_id,testrun_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']
+      testrail_api_client.send_post("update_plan_entry/#{plan_id}/#{entry_id}",case_ids)
+    end
+
     def remove_case_from_test_run(testcase,testrun_id)
       testcase_id = get_id(testcase)
       run = get_run(testrun_id)
@@ -146,7 +153,7 @@ module Cukerail
       end
     end
 
-    def add_case_to_test_run(testcase_id,testrun)
+    def add_case_to_test_run(testcase_id,testrun_id)
       run = get_run(testrun_id)
       unless run['include_all']
         case_ids = get_tests_in_a_run(testrun_id).map{|h| h['case_id']} + [testcase_id]

data/lib/tasks/cukerail.rake

@@ -30,7 +30,7 @@ task :load_to_test_run do
     testcase_id = json_sender.get_id(scenario,background_steps,project_id,suite_id,sub_section_id)
     puts "scenario_id #{scenario['id']} testcase_id = #{testcase_id}"
     json_sender.send_steps(scenario,background_steps,testcase_id)
-    json_sender.send_result(scenario,testcase_id,ENV['TESTRUN'])
+    json_sender.send_result(scenario,testcase_id,ENV['TESTRUN'].to_i)
   end
   end
 end
@@ -46,7 +46,7 @@ task :remove_from_test_run do
     testcase_ids << json_sender.get_id(scenario,background_steps,project_id,suite_id,sub_section_id)
   end  
   end  
-  json_sender.remove_all_except_these_cases_from_testrun(testcase_ids,ENV['TESTRUN'])
+  json_sender.remove_all_except_these_cases_from_testrun(testcase_ids,ENV['TESTRUN'].to_i)
 end
 
 desc "match test run cases to json results file"

metadata

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