cukerail 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 643c993ef00efc83f6faf698d87b02e2e73248d0
-  data.tar.gz: ef938045a98fffa050c180a9fcc6bd6549a41096
+  metadata.gz: acbe632026d6a5cd33ee306e3945632d4d6dbd36
+  data.tar.gz: 6e77965518ae731c673d8ed1448b96ea9716700f
 SHA512:
-  metadata.gz: 3f19cc78020397362517e49f5dff3fec52a7af543c3b01ab6cc764816d5b1e1ddd27066ddd7e23d13b2d94960a20f4ec2a3e69b5158f75f9ea2ca933d00d7e52
-  data.tar.gz: 9074945ac747956d7f3735808e7bb1cf76271e6cb74b997f9ea684fe41a590bc53177f049842e8e34f358b6ab93b3ee04c76261fbfc21a2e7f55110c24df1855
+  metadata.gz: cd9cb997cef8ea267464400419803a777dee9c2c1dedf7f9e25ac2c2322aa4a0e15e12c3b3d35691d0b5358c00636287f5c44771145ed134e2c61df20cadbbc0
+  data.tar.gz: 491648c6ed448ef4f51fa15d183d2336a50efb433f6a64c2c215b3f19e0959753944182567f224a74864e8eeedeebf0f9ca9a3ed4ee8c4c38550f64535c336dc

data/.gitignore

@@ -21,4 +21,5 @@ tmp
 *.a
 mkmf.log
 *.swp
+.byebug_history
 

data/lib/cukerail/version.rb

@@ -1,3 +1,3 @@
 module Cukerail
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

data/lib/cukerail.rb

@@ -62,16 +62,17 @@ module Cukerail
       if tagged_id
         result = /testcase_(\d+)/.match(tagged_id.name)[1]
       else
-        tags = all_tags(test_case) 
-        project_id = /\d+/.match(tags.select{|tag| tag.name =~/project/}.first.name)[0] 
-        suite_id = /\d+/.match(tags.select{|tag| tag.name =~/suite/}.first.name)[0] 
+        tags = test_case.tags
+        project_id = /\d+/.match(tags.select{|tag| tag.name =~/project/}.last.name)[0] 
+        suite_id = /\d+/.match(tags.select{|tag| tag.name =~/suite/}.last.name)[0] 
+        section_id = /\d+/.match(tags.select{|tag| tag.name =~/sub_section/}.last.name)[0] 
+        puts section_id
         title = extract_title(test_case)
-        found_case = testrail_api_client.send_get("get_cases/#{project_id}&suite_id=#{suite_id}").select{|c| c['title'] == title}.first
+        found_case = testrail_api_client.send_get("get_cases/#{project_id}&suite_id=#{suite_id}&section_id=#{section_id}").select{|c| c['title'] == title}.first
         if found_case
           result= found_case['id']
         else
-          sub_section_id = /\d+/.match(tags.select{|tag| tag.name =~/sub_section/}.first.name)[0] 
-          result = create_new_case(project_id,suite_id,sub_section_id,test_case)['id']
+          result = create_new_case(project_id,suite_id,section_id,test_case)['id']
         end
       end
       return result

data/lib/json_sender.rb

@@ -25,11 +25,17 @@ module Cukerail
 
     def get_id(scenario,background_steps,project_id,suite_id,sub_section_id)
       title = get_name(scenario)
-      found_case = testrail_api_client.send_get("get_cases/#{project_id}&suite_id=#{suite_id}").select{|c| c['title'] == title}.first
+      scenario_level_sub_section = scenario['tags'].select{|j| j['name']=~/sub_section_\d+/}.last
+      if scenario_level_sub_section
+        sub_section_id_override = /sub_section_(\d+)/.match(scenario_level_sub_section['name'])[1]
+      else
+        sub_section_id_override=sub_section_id
+      end
+      found_case = testrail_api_client.send_get("get_cases/#{project_id}&suite_id=#{suite_id}&section_id=#{sub_section_id_override}").select{|c| c['title'] == title}.first
       if found_case
         result= found_case['id']
       else
-        test_case = create_new_case(scenario,background_steps,project_id,suite_id,sub_section_id)
+        test_case = create_new_case(scenario,background_steps,project_id,suite_id,sub_section_id_override)
         result = test_case ? test_case['id'] : nil
       end
       return result
@@ -105,17 +111,17 @@ module Cukerail
     end
 
     def defects(scenario)
-       if scenario['tags']
-         tags= [scenario['tags']].flatten.compact
-         tags.select{|tag| tag['name'] =~/(?:jira|defect)_/}.map{|ticket| /(?:jira|defect)_(\w+-\d+)$/.match(ticket['name'])[1]}.uniq.join(",")
-       end
+      if scenario['tags']
+        tags = [scenario['tags']].flatten.compact
+        tags.select{|tag| tag['name'] =~/(?:jira|defect)_/}.map{|ticket| /(?:jira|defect)_(\w+-\d+)$/.match(ticket['name'])[1]}.uniq.join(",")
+      end
     end
 
     def refs(scenario)
-       if scenario['tags']
-         tags= [scenario['tags']].flatten.compact
-         tags.select{|tag| tag['name'] =~/(?:jira|ref)_/}.map{|ticket| /(?:jira|ref)_(\w+-\d+)$/.match(ticket['name'])[1]}.uniq.join(",")
-       end
+      if scenario['tags']
+        tags = [scenario['tags']].flatten.compact
+        tags.select{|tag| tag['name'] =~/(?:jira|ref)_/}.map{|ticket| /(?:jira|ref)_(\w+-\d+)$/.match(ticket['name'])[1]}.uniq.join(",")
+      end
     end
 
     def send_result(scenario,id,run_id)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cukerail
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - John Small
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-30 00:00:00.000000000 Z
+date: 2016-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber