simplecov-cobertura 3.1.0 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04ae07cb7f6bb85ad36640169b7d630c985ca1d3d067ef3485ea531b7b775209
-  data.tar.gz: 42f5899bf07710880548d48a27d8d59d2eef1b4d10a05374c44e4344f8f0ac54
+  metadata.gz: d9b68c5aa76db30753de21b0db6f942c58e0ccc41c7f77d73881215faf7bbf31
+  data.tar.gz: 19b8626568d444dc368bd9a4fad5747c78c0cb4583c0d44d074994e671d4ceab
 SHA512:
-  metadata.gz: e35c59ec78263fe81826f47b83ff5e160e08bf8aa4e01a01b943d1671974c853737e4742e5073997e4ac40d77f54f4f29a1f3d29b17a8e93021432c3f7814fc1
-  data.tar.gz: b320d8920cfb8a354031628b045077387474fb07511547cc14f277a00362fcd34ef9974dfb0464cda308f5f167e0c3c3c4bbf932b3608e463bc948dbeb0696da
+  metadata.gz: 9cd6c9bf87b3da4df600bd3c3754ed66581802eb5d46b691119f605af7707f23a14af37fba5a67f524bf36380540f259ca2f3479ee0d651d5fd8cd0c6e0f3ffd
+  data.tar.gz: 4308ed2698f5bd7c3afc7c319a6a231aa1ea501f312282fd73f9650062d34d7492e26e8cb86d127a779f11c2fbb89a80c06dc6638e063e3c7bdf219a2356f6f8

data/.github/workflows/build.yml

@@ -15,10 +15,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: [2.5, 2.6, 2.7, '3.0', 3.1, 3.2, 3.3, 3.4]
+        ruby-version: [2.5, 2.6, 2.7, '3.0', 3.1, 3.2, 3.3, 3.4, 4.0]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v6
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/lib/simplecov-cobertura/version.rb

@@ -1,7 +1,7 @@
 module SimpleCov
   module Formatter
     class CoberturaFormatter
-      VERSION = '3.1.0'
+      VERSION = '3.1.2'
     end
   end
 end

data/lib/simplecov-cobertura.rb

@@ -1,6 +1,8 @@
+require 'stringio'
 require 'rexml/document'
 require 'rexml/element'
 require 'pathname'
+require 'simplecov'
 
 require_relative 'simplecov-cobertura/version'
 
@@ -69,14 +71,21 @@ module SimpleCov
               class_.add_element(REXML::Element.new('methods'))
               class_.add_element(lines = REXML::Element.new('lines'))
 
-              branched_lines = file.branches.map(&:start_line)
-              branched_lines_covered = file.covered_branches.map(&:start_line)
+              branches_by_line = {}
+              if SimpleCov.branch_coverage?
+                file.branches.each do |branch|
+                  line_no = branch.start_line
+                  branches_by_line[line_no] ||= { total: 0, covered: 0 }
+                  branches_by_line[line_no][:total] += 1
+                  branches_by_line[line_no][:covered] += 1 if branch.covered?
+                end
+              end
 
               file.lines.each do |file_line|
                 if file_line.covered? || file_line.missed?
                   lines.add_element(line = REXML::Element.new('line'))
                   set_line_attributes(line, file_line)
-                  set_branch_attributes(line, file_line, branched_lines, branched_lines_covered) if SimpleCov.branch_coverage?
+                  set_branch_attributes(line, file_line, branches_by_line) if SimpleCov.branch_coverage?
                 end
               end
             end
@@ -133,11 +142,14 @@ module SimpleCov
           line.attributes['hits'] = file_line.coverage.to_s
         end
 
-        def set_branch_attributes(line, file_line, branched_lines, branched_lines_covered)
-          if branched_lines.include? file_line.number
-            pct_coverage, branches_covered = branched_lines_covered.include?(file_line.number) ? [100, '1/1'] : [0, '0/1']
+        def set_branch_attributes(line, file_line, branches_by_line)
+          branch_info = branches_by_line[file_line.number]
+          if branch_info
+            total = branch_info[:total]
+            covered = branch_info[:covered]
+            pct_coverage = total > 0 ? (covered * 100 / total) : 0
             line.attributes['branch'] = 'true'
-            line.attributes['condition-coverage'] = "#{pct_coverage}% (#{branches_covered})"
+            line.attributes['condition-coverage'] = "#{pct_coverage}% (#{covered}/#{total})"
           else
             line.attributes['branch'] = 'false'
           end

data/test/simplecov-cobertura_test.rb

@@ -112,6 +112,18 @@ class CoberturaFormatterTest < Test::Unit::TestCase
     assert_equal '10', last_line.attribute('number').value
     assert_equal 'true', last_line.attribute('branch').value
     assert_equal '1', last_line.attribute('hits').value
+
+    # Verify condition-coverage accurately reflects branch counts per line
+    branched_lines = lines.select { |l| l.attribute('branch').value == 'true' }
+    condition_coverages = branched_lines.map { |l| [l.attribute('number').value, l.attribute('condition-coverage').value] }
+    # Line 3: 2 branches (then=>0, else=>1) => 50% (1/2)
+    assert_include condition_coverages, ['3', '50% (1/2)']
+    # Line 5: 2 branches (then=>1, else=>0) => 50% (1/2)
+    assert_include condition_coverages, ['5', '50% (1/2)']
+    # Line 8: 1 branch (then=>0) => 0% (0/1)
+    assert_include condition_coverages, ['8', '0% (0/1)']
+    # Line 10: 1 branch (else=>1) => 100% (1/1)
+    assert_include condition_coverages, ['10', '100% (1/1)']
   end
 
   def test_groups

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simplecov-cobertura
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.2
 platform: ruby
 authors:
 - Jesse Bowes
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: SimpleCov Cobertura Formatter
 test_files: