cukerail 0.3.7 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 570992f82426d84b39ac68b25187b09e65f2e0f2
-  data.tar.gz: 90f921ed50dfc2968fc7b474a7f711044eb17e5f
+  metadata.gz: ecd3ab994dc1ef75c983e2bb539856039eb59e2c
+  data.tar.gz: a912228bc1cc3844acfbd0471b2479c6aca829aa
 SHA512:
-  metadata.gz: 12a645887f388138912dc2ffc628790ff559eaf736d68e37d3d1d9247536e6e914522142213c472a480a201071458e1e63e4a72be523a87521307b7bb74c65b3
-  data.tar.gz: 696f93b14f1f5d46bbffed0dfc239ba4990b51207947985829079741dfc02640d4c14e7ba7affde4c9dc3b514779f8c2cd81089db425ef3ec4d02dd36b552a7b
+  metadata.gz: f126d6ef8519d0c6364619d3f10003f77e4af5d590fff30db4b0df6d24679937811beb11ed1911e0245fae32f45fc5d394bf10ae711a14dc905cf441bd998384
+  data.tar.gz: 1c923b752e530f1c816639dfe964e79ff4fc7fb5e2d3fb57a6c112c7b06f15ac5fae8501fbc9bba766f0217564c02a1b3e33fc660c02cb632ca439c9d9de0e75

data/cukerail.gemspec

@@ -3,6 +3,7 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'cukerail/version'
 require "cukerail/testrail"
+# require "cucumber_extensions/formatters/json/builder"
 
 Gem::Specification.new do |spec|
   spec.name          = "cukerail"
@@ -19,6 +20,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency "cucumber", "~> 2.3.2"
+
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake","~>10.4"
   spec.add_development_dependency "rspec","~>3.2"

data/lib/cukerail/json.rb

@@ -0,0 +1,35 @@
+module Cukerail
+    require 'cucumber/formatter/json'
+    class Json < Cucumber::Formatter::Json
+      class Cucumber::Formatter::Json::Builder
+        def scenario_outline(scenario)
+          # puts 'in scenario outline'
+          @test_case_hash = {
+            id: create_id(scenario) + ';' + (@example_id.gsub(' ','').gsub(',',';')),
+            keyword: scenario.keyword,
+            name: scenario.name + ' ' + @example_id,
+            description: scenario.description,
+            line: @row.location.line,
+            type: 'scenario'
+          }
+          tags = []
+          tags += create_tags_array(scenario.tags) unless scenario.tags.empty?
+          tags += @examples_table_tags if @examples_table_tags
+          @test_case_hash[:tags] = tags unless tags.empty?
+          comments = []
+          comments += Formatter.create_comments_array(scenario.comments) unless scenario.comments.empty?
+          comments += @examples_table_comments if @examples_table_comments
+          comments += @row_comments if @row_comments
+          @test_case_hash[:comments] =  comments unless comments.empty?
+        end
+
+        def examples_table(examples_table)
+          # puts 'in examples table'
+          # We want the row data to be used in making the full scenario name
+          @example_id = @row.send(:data).map{|k,v| "#{k}=#{v}"}.join(", ")
+          @examples_table_tags = create_tags_array(examples_table.tags) unless examples_table.tags.empty?
+          @examples_table_comments = Formatter.create_comments_array(examples_table.comments) unless examples_table.comments.empty?
+        end
+       end
+    end
+end

data/lib/cukerail/version.rb

@@ -1,3 +1,3 @@
 module Cukerail
-  VERSION = "0.3.7"
+  VERSION = "0.4.0"
 end

data/lib/cukerail.rb

@@ -1,5 +1,9 @@
 require "cukerail/version"
 require "cukerail/testrail"
+# require_relative "cucumber_extensions/formatters/json/builder"
+# puts 'load extensions'
+# puts (Cucumber::Formatter.name)
+# Cucumber::Formatter::Json::Builder.include CucumberExtensions::Formatter::Json::Builder
 module Cukerail
   class Sender
     attr_reader :testrail_api_client,:failed_step
@@ -102,7 +106,7 @@ module Cukerail
       data = {'title'=>extract_title(test_case),
               'type_id'=>(is_manual ? 7 : 1 ),
               'custom_steps'=>steps_as_string,
-              'refs'=>defects(test_case)
+              'refs'=>refs(test_case)
       }
       testrail_api_client.send_post("update_case/#{id}",data)
     end
@@ -113,7 +117,7 @@ module Cukerail
       data = {'title'=>extract_title(test_case),
               'type_id'=>(is_manual ? 7 : 1 ),
               'custom_steps'=>steps_as_string,
-              'refs'=>defects(test_case)
+              'refs'=>refs(test_case)
       }
       testrail_api_client.send_post("add_case/#{sub_section_id || suite_id}", data)
     end
@@ -186,7 +190,11 @@ module Cukerail
     end
 
     def defects(test_case)
-      all_tags(test_case).select{|tag| tag.name =~/jira_/}.map{|ticket| /jira_(\w+-\d+)$/.match(ticket.name)[1]}.uniq.join(",")
+      all_tags(test_case).select{|tag| tag.name =~/(?:jira|defect)_/}.map{|ticket| /(?:jira|defect)_(\w+-\d+)$/.match(ticket.name)[1]}.uniq.join(",")
+    end
+
+    def refs(test_case)
+      all_tags(test_case).select{|tag| tag.name =~/(?:jira|ref)_/}.map{|ticket| /(?:jira|ref)_(\w+-\d+)$/.match(ticket.name)[1]}.uniq.join(",")
     end
 
     def update_run(run_id,case_ids)

data/lib/json_sender.rb

@@ -71,13 +71,19 @@ module Cukerail
       data = {'title'=>get_name(scenario),
               'type_id'=>(is_manual ? 7 : 1 ),
               'custom_steps'=>steps,
-              'refs'=>defects(scenario)
+              'refs'=>refs(scenario)
       }
     end
 
-    def defects(scenario)
+    def defects(test_case)
       if scenario['tags']
-        scenario['tags'].select{|t| t['name'] =~/@jira_/}.map{|t| /jira_(\w+-\d+)/.match(t['name'])[1]}.join(' ')
+        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
     end
 
@@ -114,7 +120,7 @@ module Cukerail
           tries -= 1
           add_case_to_test_run(id,run_id)
           if tries > 0
-             retry
+            retry
           else
             puts "#{e.message} testrun=#{run_id} test case id=#{id}"
           end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: cukerail
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.0
 platform: ruby
 authors:
 - John Small
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -96,6 +110,7 @@ files:
 - Rakefile
 - cukerail.gemspec
 - lib/cukerail.rb
+- lib/cukerail/json.rb
 - lib/cukerail/testrail.rb
 - lib/cukerail/version.rb
 - lib/json_sender.rb