cukerail 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89cc129ef2405374219790ba71227bdb5e178904
-  data.tar.gz: 91fe06120de5a825258e14fed46423e70ce2fda9
+  metadata.gz: ab0e9bf77e8c770d71213f34b24012e7a16c442b
+  data.tar.gz: 9ff864386200a05132d7b256224d283fcb83a844
 SHA512:
-  metadata.gz: 9ef15180c2f8c5142987e98e705037d9db0379d8e10d07df25e12b677917ad15358f59c893e8a98d206467e9d7272ad3ad0782d6c11b51ebff4a8735ff4ff834
-  data.tar.gz: 6ca51caba884892fcc3abc6932d1f5da6258ce9efe0096c64de1ec11806883ab81bd306fcdb2c0fb5264f6a1e95d19f0275042e9dcd7115a662a59a3260c1870
+  metadata.gz: dd003b53a3dd00f96a9fdb39495c9c6d97ea86ad24feace21ebc006c3fd6a15d49c9891ae16c1bf3e0cf5d2a3d7cb8ce6f84ed35f7ad19b5a4ba129ac7a2054c
+  data.tar.gz: 31089ad0838cc34fa3b5fb770af29b5b6f1a2490ae0068b9a648839357ccf96451acb5dfd3c6efcbd129ac1906124c287c703496343260248319b786a44796cd

data/lib/cukerail/version.rb

@@ -1,3 +1,3 @@
 module Cukerail
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/lib/cukerail.rb

@@ -102,36 +102,11 @@ module Cukerail
     end
 
     def send_steps(test_case,id)
-      steps_as_string = test_case.test_steps.map{|step| step.source.last}
-      .select{|step| step.is_a?(Cucumber::Core::Ast::Step)}
-      .reject{|step| step.is_a?(Cucumber::Hooks::BeforeHook)}.map do | g_step |
-        str = g_step.send(:keyword)+g_step.send(:name)
-        str += g_step.multiline_arg.raw.map{|l|"\n| #{l.join(' | ')} |"}.join if g_step.multiline_arg.data_table?
-        str
-      end.join("\n")
-      type_ids = [1]
-      type_ids << 7  if test_case.tags.any?{|tag| tag.name =~/manual/}
-      type_ids << 13 if test_case.tags.any?{|tag| tag.name =~/on_hold/}
-      #get the highest precedence type found in the tags. E.g. if it's @on_hold and @manual it selects 13 for on hold
-      type_id = ([13,7,1] & type_ids).first
-
-      data = {'title'=>extract_title(test_case),
-              'type_id'=>type_id,
-              'custom_steps'=>steps_as_string,
-              'refs'=>refs(test_case)
-      }
-      testrail_api_client.send_post("update_case/#{id}",data)
+      testrail_api_client.send_post("update_case/#{id}",test_case_data(test_case))
     end
 
     def create_new_case(project_id,suite_id,sub_section_id,test_case)
-      is_manual = test_case.tags.any?{|tag| tag.name =~/manual/}
-      steps_as_string = test_case.test_steps.map{|step| step.source.last}.select{|step| step.is_a?(Cucumber::Core::Ast::Step)}.map{|step| "#{step.keyword}#{step.name}"}.join("\n")
-      data = {'title'=>extract_title(test_case),
-              'type_id'=>(is_manual ? 7 : 1 ),
-              'custom_steps'=>steps_as_string,
-              'refs'=>refs(test_case)
-      }
-      testrail_api_client.send_post("add_case/#{sub_section_id || suite_id}", data)
+      testrail_api_client.send_post("add_case/#{sub_section_id || suite_id}",test_case_data(test_case))
     end
 
     def send_result(test_case,result,id,testrun)
@@ -214,6 +189,30 @@ module Cukerail
       all_tags(test_case).select{|tag| tag.name =~/(?:jira|ref)_/}.map{|ticket| /(?:jira|ref)_(\w+-\d+)$/.match(ticket.name)[1]}.uniq.join(",")
     end
 
+    def type_id(test_case)
+      type_ids = [1]
+      type_ids << 7  if test_case.tags.any?{|tag| tag.name =~/manual/}
+      type_ids << 13 if test_case.tags.any?{|tag| tag.name =~/on_hold/}
+      #get the highest precedence type found in the tags. E.g. if it's @on_hold and @manual it selects 13 for on hold
+      ([13,7,1] & type_ids).first
+    end
+
+    def test_case_data(test_case)
+      steps_as_string = test_case.test_steps.map{|step| step.source.last}
+      .select{|step| step.is_a?(Cucumber::Core::Ast::Step)}
+      .reject{|step| step.is_a?(Cucumber::Hooks::BeforeHook)}.map do | g_step |
+        str = g_step.send(:keyword)+g_step.send(:name)
+        str += g_step.multiline_arg.raw.map{|l|"\n| #{l.join(' | ')} |"}.join if g_step.multiline_arg.data_table?
+        str
+      end.join("\n")
+
+      {'title'=>extract_title(test_case),
+              'type_id'=>type_id(test_case),
+              'custom_steps'=>steps_as_string,
+              'refs'=>refs(test_case)
+      }
+    end
+
     def update_run(run_id,case_ids)
       run = get_run(run_id)
       begin

data/lib/json_sender.rb

@@ -29,7 +29,8 @@ module Cukerail
       if found_case
         result= found_case['id']
       else
-        result = create_new_case(scenario,background_steps,project_id,suite_id,sub_section_id)['id']
+        test_case = create_new_case(scenario,background_steps,project_id,suite_id,sub_section_id)
+        result = test_case ? test_case['id'] : nil
       end
       return result
     end
@@ -58,11 +59,17 @@ module Cukerail
     def create_new_case(scenario,background_steps,project_id,suite_id,sub_section_id)
       data = prepare_data(scenario,background_steps)
       testrail_api_client.send_post("add_case/#{sub_section_id || suite_id}", data)
+    rescue StandardError => e
+      puts "#{e.message} in #{get_name(scenario)}"
+      return nil
     end
 
     def send_steps(scenario,background_steps,testcase_id)
       data = prepare_data(scenario,background_steps)
       testrail_api_client.send_post("update_case/#{testcase_id}",data)
+    rescue StandardError => e
+      puts "#{e.message} in #{get_name(scenario)}"
+      return nil
     end
 
     def prepare_data(scenario,background_steps)

data/lib/tasks/cukerail.rake

@@ -1,5 +1,4 @@
 require_relative '../json_sender'
-require 'byebug'
 desc 'load a json results file into a test suite, JSON=filename'
 task :load_to_suite do
   raise 'You must have JSON=filename on the command line' unless ENV['JSON']
@@ -47,7 +46,8 @@ 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'].to_i)
+  # if the title is mroe than 255 characters then Testrail can't create the case, so the id will be nil so we should compact the array
+  json_sender.remove_all_except_these_cases_from_testrun(testcase_ids.compact,ENV['TESTRUN'].to_i)
 end
 
 desc "match test run cases to json results file,"
@@ -68,5 +68,6 @@ task :remove_from_test_suite 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_suite(testcase_ids,ex_project_id,ex_suite_id)
+  # if the title is mroe than 255 characters then Testrails can't create the case, so the id will be nil so we should compact the array
+  json_sender.remove_all_except_these_cases_from_suite(testcase_ids.compact,ex_project_id,ex_suite_id)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cukerail
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - John Small