Improve tests

Author: Federico Moya

.rubocop.yml

@@ -5,3 +5,7 @@ AllCops:
 
 Style/Documentation:
   Enabled: false
+
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*'

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.4
+FROM ruby:2.5
 
 WORKDIR /gem
 

spec/fixtures/sample.json

@@ -9,10 +9,19 @@
         1,
         1,
         1,
+        1,
+        null,
+        null,
+        1,
+        1,
         null,
         null,
         1,
         1,
+        0,
+        null,
+        1,
+        null,
         null,
         null,
         "ignored",

spec/fixtures/sample.rb

@@ -1,13 +1,22 @@
 # Foo class
 class Foo
   def initialize
-    @foo = "baz"
+    @foo = 'bar'
+    @bar = 'foo'
   end
 
   def bar
     @foo
   end
 
+  def foo(param)
+    if param
+      @bar
+    else
+      @foo
+    end
+  end
+
   #:nocov:
   def skipped
     @foo * 2

spec/fixtures/sample_with_branch.json

@@ -9,10 +9,19 @@
         1,
         1,
         1,
+        1,
+        null,
+        null,
+        1,
+        1,
         null,
         null,
         1,
         1,
+        0,
+        null,
+        1,
+        null,
         null,
         null,
         "ignored",
@@ -23,7 +32,18 @@
         null
       ],
       "branches": [
-
+        {
+          "type": "then",
+          "start_line": 14,
+          "end_line": 14,
+          "coverage": 0
+        },
+        {
+          "type": "else",
+          "start_line": 16,
+          "end_line": 16,
+          "coverage": 1
+        }
       ]
     }
   }

spec/simplecov_json_formatter_spec.rb

@@ -1,11 +1,15 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
+require 'byebug'
 
 describe SimpleCov::Formatter::JSONFormatter do
   let(:result) do
     SimpleCov::Result.new({
-                            source_fixture('sample.rb') => { 'lines' => [nil, 1, 1, 1, nil, nil, 1, 1, nil, nil] }
+                            source_fixture('sample.rb') => { 'lines' => [
+                              nil, 1, 1, 1, 1, nil, nil, 1, 1, nil, nil,
+                              1, 1, 0, nil, 1, nil, nil, nil, nil, 1, 0, nil, nil, nil
+                            ] }
                           })
   end
 
@@ -18,6 +22,30 @@
     end
 
     context 'whit branch coverage' do
+      let(:original_lines) do
+        [nil, 1, 1, 1, 1, nil, nil, 1, 1,
+         nil, nil, 1, 1, 0, nil, 1, nil,
+         nil, nil, nil, 1, 0, nil, nil, nil]
+      end
+
+      let(:original_branches) do
+        {
+          [:if, 0, 13, 4, 17, 7] => {
+            [:then, 1, 14, 6, 14, 10] => 0,
+            [:else, 2, 16, 6, 16, 10] => 1
+          }
+        }
+      end
+
+      let(:result) do
+        SimpleCov::Result.new({
+                                source_fixture('sample.rb') => {
+                                  'lines' => original_lines,
+                                  'branches' => original_branches
+                                }
+                              })
+      end
+
       before do
         enable_branch_coverage
       end