res 1.2.11 → 1.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30733552e025a5f8a126750194414b8250b95fc7
-  data.tar.gz: eb3d3795f5743b983a61809974c5816149f5706c
+  metadata.gz: 5fa3f63bf69641606ead0c84b5f495ee55ec0c84
+  data.tar.gz: bf4bdb3d3e75bcf7dc67e1fbe7572e4a14742c52
 SHA512:
-  metadata.gz: 839468cb3ad1fdc72a8aa5f373adfc80c6c97d361c3361a97a147799282b852872712cc646369f0dae557f8a5b34c3cb17ac2e009cb65fcd1f6561dfbc511186
-  data.tar.gz: b9a7b700c6cca3eee353847e95438677e0f4db3d778628435c05d180fd7786b8f20914bf5927bd4d1882ae47a34320e87168e66ba8a93e7a38c7f33593e8ec98
+  metadata.gz: 9cfdf0bf42bf29a42febf405efe1ac577592d8e31651e0cae4eb79b9019bf0c33cd9b51996fbc5817f4691432534ce750d8664dcf214621eff7149d9782bf15b
+  data.tar.gz: ebd752c7a0dd9fdc3067fb4ae0418814be9ad1a94c77dee6657371913c72e2e27221f4bc17977cdcb7ea93bfc950b983d264b58d4f3ea21dabce60c264ad36ce

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 if !result[@count].has_key?(:children)
-            result[@count][:children][index] = Hash.new
+            result[@count][:children] = Array.new unless result[@count].has_key?(:children)
+            result[@count][:children][index] = {}
             result[@count][:children][index] = add_result(group_notification.group.examples[i].metadata)
             index += 1
             i += 1

data/lib/res/formatters/ruby_cucumber2.rb

@@ -14,7 +14,11 @@ module Res
      
       def initialize(runtime, path_or_io, options)
         @runtime = runtime
-        @io = ensure_io(path_or_io) 
+        begin
+          @io = ensure_io(path_or_io) 
+        rescue
+          @io = ensure_io(path_or_io, '')
+        end
         @options = options
         @exceptions = []
         @indent = 0
@@ -32,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
@@ -41,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]
@@ -55,7 +59,7 @@ module Res
       end
 
       def comment_line(comment_line)
-        @_context[:comments] = [] if !@_context[:comments]
+        @_context[:comments] = [] unless @_context[:comments]
         @_context[:comments] << comment_line 
       end
 
@@ -63,7 +67,7 @@ module Res
       end
 
       def tag_name(tag_name)
-        @_context[:tags] = [] if !@_context[:tag]
+        @_context[:tags] = [] unless @_context[:tag]
         # Strip @ from tags
         @_context[:tags] << tag_name[1..-1]
       end
@@ -72,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 }
@@ -82,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)
@@ -100,7 +104,7 @@ module Res
           @_feature_element[:file] = 'unknown'
         end
 
-        @_feature[:children] = [] if ! @_feature[:children]
+        @_feature[:children] = [] unless @_feature[:children]
 
         @_feature[:children] << @_feature_element
         @_context = @_feature_element
@@ -122,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
@@ -147,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
 
@@ -159,8 +163,8 @@ module Res
         # to scenario that don't exist
         return if @_feature_element && @_feature_element[:finished]
 
-        @_feature_element = {} if !@_feature_element
-        @_feature_element[:children] = [] if !@_feature_element[:children]
+        @_feature_element = {} unless @_feature_element
+        @_feature_element[:children] = [] unless @_feature_element[:children]
         @_feature_element[:children] << @_step
         @_context = @_step
       end
@@ -169,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
         
@@ -208,23 +212,23 @@ module Res
 
       def before_table_row(table_row)
         @_current_table_row = { :type => 'Cucumber::ScenarioOutline::Example' }
-        @_table = [] if !@_table
+        @_table = [] unless @_table
       end
 
       def after_table_row(table_row)
-	if table_row.class == Cucumber::Formatter::LegacyApi::Ast::ExampleTableRow
+        if table_row.class == Cucumber::Formatter::LegacyApi::Ast::ExampleTableRow
 
           @_current_table_row[:name] = table_row.name
           if table_row.exception
             @_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
@@ -234,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/parsers/android_junit.rb

@@ -6,51 +6,55 @@ module Res
       attr_accessor :io
      
       def initialize(instrument_output)
-        result = Array.new
         result = parse(instrument_output)
         ir = ::Res::IR.new( :type        => 'AndroidJUnitRunner', 
-                            :started     => "",
-                            :finished    => Time.now(),
+                            :started     => '',
+                            :finished    => Time.now,
                             :results     => result
                             )
-        @io = File.open("./instruments.res", "w")
+        @io = File.open('./instruments.res', 'w')
         @io.puts ir.json
         @io.close
       end
 
       def parse(output)
-        class_name = Array.new
-        test = Array.new
-        result = Array.new
+        class_name = []
+        result = []
         test = {
-          type: "AndroidJUnit::Test",
+          type: 'AndroidJUnit::Test',
           name: 'UNKNOWN',
-          status: "passed"
+          status: 'passed'
         }
+
         File.open(output) do |f|
           f.each_line do |line|
-            if line.include?("INSTRUMENTATION_STATUS_CODE")
+
+            if line.include?('INSTRUMENTATION_STATUS_CODE')
+              # Skip if this is just the 'pre-run' test
+              if line.include?('INSTRUMENTATION_STATUS_CODE: 1')
+                next
+              end
               result.last[:children] << test
               test = {
-                type: "AndroidJUnit::Test",
+                type: 'AndroidJUnit::Test',
                 name: 'UNKNOWN',
-                status: "passed"
+                status: 'passed'
               }
             end
 
-            if line.include?("class")
-              line = line.gsub("INSTRUMENTATION_STATUS: class=", "").strip
-              if !class_name.include? line
-                class_name.push(line) 
+            if line.include?('class')
+              line = line.gsub('INSTRUMENTATION_STATUS: class=', '').strip
+              unless class_name.include? line
+                class_name.push(line)
                 result << {
-                  type: "AndroidJUnit::Class",
+                  type: 'AndroidJUnit::Class',
                   name: class_name.last,
                   children: Array.new
                 }
               end
-            elsif line.include?("test=")
-              test[:name] = line.gsub("INSTRUMENTATION_STATUS: test=", "").strip
-            elsif line.include?("Error in ")
+            elsif line.include?('test=')
+              test[:name] = line.gsub('INSTRUMENTATION_STATUS: test=', '').strip
+            elsif line.include?('Error in ')
               test[:status] = 'failed'
             end
           end

data/lib/res/parsers/junit.rb

@@ -15,45 +15,44 @@ module Res
          raise "Invalid xunit XML format. Error: #{e}"
         end
         file.close
-        result = Array.new
         result = attach_suite(junit)
         ir = ::Res::IR.new( :type        => 'Junit', 
-                            :started     => "",
-                            :finished    => Time.now(),
+                            :started     => '',
+                            :finished    => Time.now,
                             :results     => result
                             )
-        @io = File.open("./junit.res", "w")
+        @io = File.open('./junit.res', 'w')
         @io.puts ir.json
         @io.close
       end
 
       def attach_cases(node)
         testcase = Hash.new
-        testcase["type"] = "JUnit::" + node.value
-        testcase["name"] = node.attributes[:name]
-        testcase["classname"] = node.attributes[:classname] if testcase["classname"] != nil
-        testcase["duration"] = node.attributes[:time]
-        testcase["status"] = "passed"
+        testcase['type'] = "JUnit::#{node.value}"
+        testcase['name'] = node.attributes[:name]
+        testcase['classname'] = node.attributes[:classname] if testcase['classname'] != nil
+        testcase['duration'] = node.attributes[:time]
+        testcase['status'] = 'passed'
         if node.nodes[0] != nil
-          testcase["status"] = "failed" if node.nodes[0].value == "failure" or node.nodes[0].value == "error"
-          testcase["status"] = "notrun" if node.nodes[0].value == "skipped"
+          testcase['status'] = 'failed' if node.nodes[0].value == 'failure' or node.nodes[0].value == 'error'
+          testcase['status'] = 'notrun' if node.nodes[0].value == 'skipped'
         end
         testcase
       end
 
       def attach_suite(component)
-        suite = Array.new
+        suite = []
         index = 0
         component.nodes.each do |node|
-          if node.value == "testcase"
+          if node.value == 'testcase'
             suite[index] = Hash.new
             suite[index] = attach_cases(node)
           else 
             suite[index] = Hash.new
-            suite[index]["type"] = "JUnit::" + node.value
-            suite[index]["name"] = node.attributes[:name]
-            suite[index]["classname"] = node.attributes[:classname] if suite[index]["classname"] != nil
-            suite[index]["children"] = attach_suite(node)
+            suite[index]['type'] = "JUnit::#{node.value}"
+            suite[index]['name'] = node.attributes[:name]
+            suite[index]['classname'] = node.attributes[:classname] if suite[index]['classname'] != nil
+            suite[index]['children'] = attach_suite(node)
           end # if 
         index += 1
         end # each

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) if !@synced
+        sync_tests(ir) unless @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
-        return "Submitted to Test Rail"
+        'Submitted to Test Rail'
       end
 
       def tr
@@ -136,11 +136,9 @@ 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])  if !section.nil?
-              @case_status[:"#{tcase.id}"] = child[:status] if !tcase.nil?
-
+              tcase = section.find_test_case(:title => child[:name]) unless section.nil?
+              @case_status[:"#{tcase.id}"] = child[:status] unless tcase.nil?
           end
         end
       end

data/lib/res/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: res
 version: !ruby/object:Gem::Version
-  version: 1.2.11
+  version: 1.2.12
 platform: ruby
 authors:
 - BBC
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-07 00:00:00.000000000 Z
+date: 2016-08-30 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.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Test Result report libraries