Consder converage's branch method disable

Author: Federico Moya

lib/simplecov_json_formatter/source_file_formatter.rb

@@ -7,14 +7,27 @@ def initialize(source_file)
     end
 
     def format
+      if SimpleCov.branch_coverage?
+        line_coverage.merge(branch_coverage)
+      else
+        line_coverage
+      end
+    end
+
+    private
+
+    def line_coverage
+      @line_coverage || {
+        lines: lines
+      }
+    end
+
+    def branch_coverage
       {
-        lines: lines,
         branches: branches
       }
     end
 
-    private
-
     def lines
       lines = []
       @source_file.lines.each do |line|

spec/fixtures/sample.json

@@ -21,9 +21,6 @@
         "ignored",
         "ignored",
         null
-      ],
-      "branches": [
-
       ]
     }
   }

spec/fixtures/sample_with_branch.json

@@ -0,0 +1,30 @@
+{
+  "meta": {
+    "simplecov_version": "0.18.5"
+  },
+  "coverage": {
+    "/gem/spec/fixtures/sample.rb": {
+      "lines": [
+        null,
+        1,
+        1,
+        1,
+        null,
+        null,
+        1,
+        1,
+        null,
+        null,
+        "ignored",
+        "ignored",
+        "ignored",
+        "ignored",
+        "ignored",
+        null
+      ],
+      "branches": [
+
+      ]
+    }
+  }
+}

spec/simplecov_json_formatter_spec.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-require 'byebug'
 
 describe SimpleCov::Formatter::JSONFormatter do
   let(:result) do
@@ -11,9 +10,22 @@
   end
 
   describe 'format' do
-    it 'works' do
-      subject.format(result)
-      expect(json_ouput).to eq(json_result('sample'))
+    context 'whit line coverage' do
+      it 'works' do
+        subject.format(result)
+        expect(json_ouput).to eq(json_result('sample'))
+      end
+    end
+
+    context 'whit branch coverage' do
+      before do
+        enable_branch_coverage
+      end
+
+      it 'works' do
+        subject.format(result)
+        expect(json_ouput).to eq(json_result('sample_with_branch'))
+      end
     end
   end
 end

spec/spec_helper.rb

@@ -6,6 +6,10 @@
 
 SimpleCov.coverage_dir('tmp/coverage')
 
+def enable_branch_coverage
+  allow(SimpleCov).to receive(:branch_coverage?).and_return(true)
+end
+
 def source_fixture(filename)
   File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', filename))
 end