Fix table output include

chetan · Mar 4, 2020 · c27e257 · c27e257
1 parent b2d3598
commit c27e257
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/lib/simplecov-console.rb b/lib/simplecov-console.rb
@@ -25,16 +25,19 @@ class << self
   # configure output format ('table', 'block')
   SimpleCov::Formatter::Console.output_style = ENV.fetch('OUTPUT_STYLE', 'table')
 
-  def format(result)
-
+  def include_output_style
     if SimpleCov::Formatter::Console.output_style == 'block' then
       require 'simplecov-console/output/block'
       extend BlockOutput
     else
       # default to table
-      require './output/table'
+      require 'simplecov-console/output/table'
       extend TableOutput
     end
+  end
+
+  def format(result)
+    include_output_style
 
     root = nil
     if Module.const_defined? :ROOT then

diff --git a/test/test_simplecov-console.rb b/test/test_simplecov-console.rb
@@ -32,21 +32,24 @@ def test_missed
 
   def test_table_output
     SimpleCov::Formatter::Console.output_style = 'table'
+    @console.include_output_style
     files = [
       SourceFile.new('foo.rb',5,[2,3],[Line.new(1), Line.new(4), Line.new(5)],40.0)
     ]
-    actual = @console.table_output(files,'/')
+    actual = @console.output(files,'/')
     assert actual.is_a? Terminal::Table
-    assert_equal 1, actual.rows.count 
+    assert_equal 1, actual.rows.count
   end
 
   def test_block_output
     SimpleCov::Formatter::Console.use_colors = false
     SimpleCov::Formatter::Console.output_style = 'block'
+    @console.include_output_style
+
     files = [
       SourceFile.new('foo.rb',5,[2,3],[Line.new(1), Line.new(4), Line.new(5)],40.0)
     ]
     expected = "\n    file: foo.rb\ncoverage: 40.00% (2/5 lines)\n  missed: 1, 4-5\n\n"
-    assert_equal expected, @console.block_output(files,'/')
+    assert_equal expected, @console.output(files,'/')
   end
 end