res 1.2.12 → 1.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fa3f63bf69641606ead0c84b5f495ee55ec0c84
-  data.tar.gz: bf4bdb3d3e75bcf7dc67e1fbe7572e4a14742c52
+  metadata.gz: 117cc8f2ed1a6ffac5917c3efbd3bfaf81e23bc3
+  data.tar.gz: 4f9b940d44b3bf640dd850d085a123af6dfa8cba
 SHA512:
-  metadata.gz: 9cfdf0bf42bf29a42febf405efe1ac577592d8e31651e0cae4eb79b9019bf0c33cd9b51996fbc5817f4691432534ce750d8664dcf214621eff7149d9782bf15b
-  data.tar.gz: ebd752c7a0dd9fdc3067fb4ae0418814be9ad1a94c77dee6657371913c72e2e27221f4bc17977cdcb7ea93bfc950b983d264b58d4f3ea21dabce60c264ad36ce
+  metadata.gz: 73f6d37520d29d9629988e18f28da72551abc99f90e77c065ba6bce12286722b7f1261f38e3e4f6d08fa31ec8fe9c4b5352f00c3954d2d6542ae3447a2f5145c
+  data.tar.gz: 6610f245ffcd36f2294c9ba61309f0e8e95fea5ea2df26711d8fe15a68b5ff8b8755b44607ca0073be057eb8724e2bc9ad927cf3b777270cc3d47876a3f5c579

data/lib/res/formatters/rspec.rb

@@ -38,8 +38,8 @@ module Res
             index =0
           end
           while i < group_notification.group.examples.count
-            result[@count][:children] = Array.new unless result[@count].has_key?(:children)
-            result[@count][:children][index] = {}
+            result[@count][:children] = Array.new if !result[@count].has_key?(:children)
+            result[@count][:children][index] = Hash.new
             result[@count][:children][index] = add_result(group_notification.group.examples[i].metadata)
             index += 1
             i += 1

data/lib/res/formatters/ruby_cucumber2.rb

@@ -36,7 +36,7 @@ module Res
       def after_features(features)
         results = @_features
         ir = ::Res::IR.new( :started     => @_start_time,
-                            :finished    => Time.now,
+                            :finished    => Time.now(),
                             :results     => results,
                             :type        => 'Cucumber' )
         @io.puts ir.json
@@ -45,7 +45,7 @@ module Res
       def before_feature(feature)
         @_feature = {}
         @_context = {}
-        @_feature[:started] = Time.now
+        @_feature[:started] = Time.now()
         begin
           hash = RubyCucumber2.split_uri( feature.location.to_s )
           @_feature[:file] = hash[:file]
@@ -59,7 +59,7 @@ module Res
       end
 
       def comment_line(comment_line)
-        @_context[:comments] = [] unless @_context[:comments]
+        @_context[:comments] = [] if !@_context[:comments]
         @_context[:comments] << comment_line 
       end
 
@@ -67,7 +67,7 @@ module Res
       end
 
       def tag_name(tag_name)
-        @_context[:tags] = [] unless @_context[:tag]
+        @_context[:tags] = [] if !@_context[:tag]
         # Strip @ from tags
         @_context[:tags] << tag_name[1..-1]
       end
@@ -76,7 +76,7 @@ module Res
       #   :name => 'Feature name',
       #   :description => "As a blah\nAs a blah\n" }
       def feature_name(keyword, name)
-        @_feature[:type] = "Cucumber::#{keyword.gsub(/\s+/, '')}"
+        @_feature[:type] = "Cucumber::" + keyword.gsub(/\s+/, "")
 
         lines = name.split("\n")
         lines = lines.collect { |l| l.strip }
@@ -86,7 +86,7 @@ module Res
       end
 
       def after_feature(feature)
-        @_feature[:finished] = Time.now
+        @_feature[:finished] = Time.now()
       end
 
       def before_feature_element(feature_element)
@@ -104,7 +104,7 @@ module Res
           @_feature_element[:file] = 'unknown'
         end
 
-        @_feature[:children] = [] unless @_feature[:children]
+        @_feature[:children] = [] if ! @_feature[:children]
 
         @_feature[:children] << @_feature_element
         @_context = @_feature_element
@@ -126,7 +126,7 @@ module Res
         end
 
         if fail.compact.empty? and feature_element.respond_to? :status
-          @_feature_element[:status] = feature_element.status if feature_element.status.to_s != 'skipped'
+          @_feature_element[:status] = feature_element.status if feature_element.status.to_s != "skipped"
         else
           fail = fail.compact
           @_feature_element[:status] = fail[0].status
@@ -151,7 +151,7 @@ module Res
 
 
       def scenario_name(keyword, name, file_colon_line, source_indent)
-        @_context[:type] = "Cucumber::#{keyword.gsub(/\s+/, '')}"
+        @_context[:type] = "Cucumber::" + keyword.gsub(/\s+/, "")
         @_context[:name] = name || ''
       end
 
@@ -163,8 +163,8 @@ module Res
         # to scenario that don't exist
         return if @_feature_element && @_feature_element[:finished]
 
-        @_feature_element = {} unless @_feature_element
-        @_feature_element[:children] = [] unless @_feature_element[:children]
+        @_feature_element = {} if !@_feature_element
+        @_feature_element[:children] = [] if !@_feature_element[:children]
         @_feature_element[:children] << @_step
         @_context = @_step
       end
@@ -173,12 +173,12 @@ module Res
 
         file_colon_line = args[0] if args[0]
 
-        @_step[:type] = 'Cucumber::Step'
+        @_step[:type] = "Cucumber::Step"
         name = keyword + step_match.format_args(lambda{|param| %{#{param}}}) 
         @_step[:name] = name
         @_step[:status] = status
         #@_step[:background] = background
-        @_step[:type] = 'Cucumber::Step'
+        @_step[:type] = "Cucumber::Step"
 
       end
         
@@ -212,7 +212,7 @@ module Res
 
       def before_table_row(table_row)
         @_current_table_row = { :type => 'Cucumber::ScenarioOutline::Example' }
-        @_table = [] unless @_table
+        @_table = [] if !@_table
       end
 
       def after_table_row(table_row)
@@ -223,12 +223,12 @@ module Res
             @_current_table_row[:message] = table_row.exception.to_s
           end
 
-          if table_row.status and table_row.status != 'skipped' and table_row.status != nil
+          if table_row.status and table_row.status != "skipped" and table_row.status != nil
             @_current_table_row[:status] = table_row.status
           end
             
           @_current_table_row[:line] = table_row.line
-          @_current_table_row[:urn] = @_feature_element[:file] + ':' + table_row.line.to_s
+          @_current_table_row[:urn] = @_feature_element[:file] + ":" + table_row.line.to_s
           @_table << @_current_table_row
         end
       end
@@ -238,7 +238,7 @@ module Res
 
       def table_cell_value(value, status)
         @_current_table_row[:children] = [] if !@_current_table_row[:children]
-        @_current_table_row[:children] << { :type => 'Cucumber::ScenarioOutline::Parameter',
+        @_current_table_row[:children] << { :type => "Cucumber::ScenarioOutline::Parameter",
                                             :name => value, :status => status }
       end
 

data/lib/res/reporters/lion.rb

@@ -21,6 +21,15 @@ module Res
         status = "failed"
         status = "passed" if ir.tests.count == ir.count(:passed)
 
+        if ir.values.has_key?('#type') && ir.values['#type'] == 'multiple'
+          measures = {}
+          ir.values.select { |k, v| k !~ /^[#_]/ }.each do |k, v|
+            measures[k] = { :count => v, :total => ir.values['_total'] }
+          end
+        else
+          measures = ir.values
+        end
+
         # Set Lion Data
         lion_data = {
           :app_name => config.app_name,
@@ -32,10 +41,9 @@ module Res
           :started => ir.results.first[:started],
           :finished => ir.results.last[:finished],
           :status => status,
-          :measures => ir.values
+          :measures => measures
         }
         
-        
         uri = URI.parse(config.url)
         @http = Net::HTTP.new(uri.host, uri.port)
         if config.cert

data/lib/res/reporters/test_rail.rb

@@ -14,7 +14,7 @@ module Res
         config.process(args)
 
         @case_status = {}
-        @io = File.new('./.test_rail_reporter.log','w+')
+        @io = File.new("./.test_rail_reporter.log","w+") 
       
         test_rail_project = config.project
         @suite_name = config.suite 
@@ -35,7 +35,7 @@ module Res
         @mappings = Res::Mappings.new(@ir.type)
 
         suite = @project.find_or_create_suite(:name => @suite_name, :id => @project.id)
-        @io.puts 'Syncing Suite'
+        @io.puts "Syncing Suite"
 
         i = 0
           while i < @ir.results.count         
@@ -44,13 +44,13 @@ module Res
             i += 1
           end # while
         @synced = true
-        @io.puts '> Sync Successful'
+        @io.puts "> Sync Successful"
       end
 
       # Submits run against suite
       # Either creates a new run using run_name or use existing run_id 
       def submit_results(ir, args = {})
-        sync_tests(ir) unless @synced
+        sync_tests(ir) if !@synced
         suite = @project.find_suite(:name => @suite_name)
 
         run_name = @config.run_name || args[:run_name] || nil
@@ -74,9 +74,9 @@ module Res
             end
 
         else
-          @io.puts '> run_name and run_id are either nil or not specified'
+          @io.puts "> run_name and run_id are either nil or not specified"
           @io.close
-          return 'run_name and run_id are either nil or not specified'
+          return "run_name and run_id are either nil or not specified"          
 
         end
 
@@ -94,10 +94,10 @@ module Res
           end # while
         end # ifa
         add_case_status(run_id)
-        @io.puts '> Added the test case status'
-        @io.puts '> Submit Successful'
+        @io.puts "> Added the test case status"
+        @io.puts "> Submit Successful"
         @io.close
-        'Submitted to Test Rail'
+        return "Submitted to Test Rail"
       end
 
       def tr
@@ -136,9 +136,11 @@ module Res
           if @mappings.context.include?(child[:type])
               section = section.find_section(:name => child[:name])   
               case_details(child, section)
+
           elsif @mappings.case.include?(child[:type])  
-              tcase = section.find_test_case(:title => child[:name]) unless section.nil?
-              @case_status[:"#{tcase.id}"] = child[:status] unless tcase.nil?
+              tcase = section.find_test_case(:title => child[:name])  if !section.nil?
+              @case_status[:"#{tcase.id}"] = child[:status] if !tcase.nil?
+
           end
         end
       end

data/lib/res/version.rb

@@ -1,3 +1,3 @@
 module Res
-  VERSION = '1.2.12'
+  VERSION = '1.2.13'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: res
 version: !ruby/object:Gem::Version
-  version: 1.2.12
+  version: 1.2.13
 platform: ruby
 authors:
 - BBC
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Test Result report libraries