cukerail 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75e6fc40ef21987c38033b470c41f5035179c223
-  data.tar.gz: 84eb59245d2ac558cf377835fb93b9744fd23e3a
+  metadata.gz: fcb1e0a9b7c38f50b8804df39b29e0157077591c
+  data.tar.gz: fe105c55011ce966dd6105019bce6d0b9d33824b
 SHA512:
-  metadata.gz: 319fe786247626271bff9ff21a54984cd3e1ebd0f3d808a25c2c55ec8ca3f0d001410a0b5f27f7a0dbd11d407cbc6644f662758ef06d0178a6395d99e578b194
-  data.tar.gz: a13e62c61a87df9cdbc72af66142255bfecc6df5c26a03b88db1cba48ee2888edbf4c83c7e5c6f6c2642892edd442f05380f240b8c61324500a9f690c9787f37
+  metadata.gz: 0482e90c13c1e1ac3403c4b531a48a59a5863b15b6a7ed007b6676a3092f793bf991f6bb3310156a75a4d22f00d6ae40fd65ed138f138adde1ffd6b077445268
+  data.tar.gz: bdfd582e2d35f50decab8e2dd35e948a376b6f36af968934741bc43c2fcb23532408d387d6c74b637eaf0c98519b40e2fbf1bb9181a9f8059ba4e8e990bf8b55

data/lib/cukerail/version.rb

@@ -1,3 +1,3 @@
 module Cukerail
-  VERSION = "0.4.4"
+  VERSION = "0.5.0"
 end

data/lib/cukerail.rb

@@ -23,6 +23,9 @@ module Cukerail
       @id = get_id(test_case)
       raise 'No id found' unless @id
       send_steps(test_case,@id)
+      if ENV['UPDATE_SOURCE']
+        update_source_file(test_case,@id) unless test_case.source.any?{|h| h.is_a?(Cucumber::Core::Ast::ScenarioOutline)}
+      end
       if ENV['TESTRUN']
         send_result(test_case,result,@id,ENV['TESTRUN'].to_i) 
       end
@@ -55,31 +58,38 @@ module Cukerail
 
     def get_id(test_case)
       #      ap test_case.methods - Object.methods
-      tagged_id = test_case.tags.select{|tag| tag.name =~/testcase/}.first
-      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] 
-      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
-      if found_case
-        result= found_case['id']
+      tagged_id = test_case.tags.detect{|tag| tag.name =~/testcase/}
+      if tagged_id
+        result = /testcase_(\d+)/.match(tagged_id.name)[1]
       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']
+        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] 
+        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
+        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']
+        end
       end
       return result
     end
 
     def update_source_file(scenario, external_reference)
       #this could be done on one line with sed. But the format is different on Mac OS and GNU Linux version and it definitely won't work on a Windows machine
-      path = scenario.file
-      lines = IO.readlines(scenario.file)
-      lines[scenario.line-2].gsub!(/ @testcase_\d*/," @testcase_#{external_reference}") 
-      lines[scenario.line-2].gsub!(/\n/," @testcase_#{external_reference}") unless lines[scenario.line-2] =~ /testcase/ 
+      # byebug
+      path = scenario.location.file
+      # ap path
+      lines = IO.readlines(path)
+      lines[scenario.location.line-2].gsub!(/ @testcase_\d*/," @testcase_#{external_reference}") 
+      lines[scenario.location.line-2].gsub!(/\n/," @testcase_#{external_reference}") unless lines[scenario.location.line-2] =~ /testcase/ 
       temp_file = Tempfile.new('foo')
       begin
         File.open(path, 'r') do |file|
           lines.each do |line|
+            # puts line
             temp_file.puts line
           end
         end
@@ -98,7 +108,7 @@ module Cukerail
         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")
+      end.join("\n")
       is_manual = test_case.tags.any?{|tag| tag.name =~/manual/}
       data = {'title'=>extract_title(test_case),
               'type_id'=>(is_manual ? 7 : 1 ),

data/lib/json_sender.rb

@@ -75,16 +75,18 @@ module Cukerail
       }
     end
 
-    def defects(test_case)
-      if scenario['tags']
-        all_tags(test_case).select{|tag| tag['name'] =~/(?:jira|defect)_/}.map{|ticket| /(?:jira|defect)_(\w+-\d+)$/.match(ticket['name'])[1]}.uniq.join(",")
-      end
-    end
-
-    def refs(test_case)
-      if scenario['tags']
-        all_tags(test_case).select{|tag| tag['name'] =~/(?:jira|ref)_/}.map{|ticket| /(?:jira|ref)_(\w+-\d+)$/.match(ticket['name'])[1]}.uniq.join(",")
-      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
+    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
     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.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - John Small
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-14 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber