Show covered/total ratios in summary stats

Author: sferik

assets/stylesheets/screen.css

@@ -420,32 +420,6 @@ a.src_link {
   word-break: break-all;
 }
 
-/* --- Coverage bar in table --------------------------------- */
-
-.coverage-bar {
-  display: flex;
-  align-items: center;
-  gap: var(--sp-2);
-  min-width: 120px;
-}
-
-.coverage-bar__track {
-  flex: 1;
-  height: var(--bar-height);
-  background: var(--bar-bg);
-  border-radius: 3px;
-  overflow: hidden;
-}
-
-.coverage-bar__fill {
-  height: 100%;
-  border-radius: 3px;
-  transition: width 0.3s ease-out;
-}
-
-.coverage-bar__fill--green { background: var(--green); }
-.coverage-bar__fill--yellow { background: var(--yellow); }
-.coverage-bar__fill--red { background: var(--red); }
 
 /* --- Color utility classes --------------------------------- */
 

public/application.css

@@ -113,9 +113,9 @@ def assert_header_coverage(html_doc)
 
     return if RUBY_ENGINE == "jruby"
 
-    branch_covered = html_doc.at_css("div#AllFiles div.t-branch-summary span.green").content.strip
+    branch_summary = html_doc.at_css("div#AllFiles div.t-branch-summary").content.strip
 
-    assert_match(/covered/, branch_covered)
+    assert_match(/covered/, branch_summary)
   end
 
   def assert_line_coverages(html_doc)

test/test_simple_cov-html.rb

@@ -9,23 +9,20 @@
 
   <div class="summary-stats">
     <div class="t-line-summary">
-      <b><%= source_files.length %></b> files,
-      <b><%= source_files.lines_of_code %></b> relevant lines:
-      <span class="green"><b><%= source_files.covered_lines %></b> covered</span>,
-      <span class="red"><b><%= source_files.missed_lines %></b> missed</span>
+      <b><%= source_files.length %></b> files.
+      Lines: <span class="green"><b><%= source_files.covered_lines %></b></span>/<b><%= source_files.lines_of_code %></b> relevant lines covered<% if source_files.missed_lines > 0 %>,
+      <span class="red"><b><%= source_files.missed_lines %></b> missed</span><% end %>
     </div>
 <%- if branch_coverage? -%>
     <div class="t-branch-summary">
-      <b><%= source_files.total_branches %></b> branches:
-      <span class="green"><b><%= source_files.covered_branches %></b> covered</span>,
-      <span class="red"><b><%= source_files.missed_branches %></b> missed</span>
+      Branches: <span class="green"><b><%= source_files.covered_branches %></b></span>/<b><%= source_files.total_branches %></b> covered<% if source_files.missed_branches > 0 %>,
+      <span class="red"><b><%= source_files.missed_branches %></b> missed</span><% end %>
     </div>
 <%- end -%>
 <%- if method_coverage? -%>
     <div class="t-method-summary">
-      <b><%= source_files.total_methods %></b> methods:
-      <span class="green"><b><%= source_files.covered_methods %></b> covered</span>,
-      <span class="red"><b><%= source_files.missed_methods %></b> missed</span>
+      Methods: <span class="green"><b><%= source_files.covered_methods %></b></span>/<b><%= source_files.total_methods %></b> covered<% if source_files.missed_methods > 0 %>,
+      <span class="red"><b><%= source_files.missed_methods %></b> missed</span><% end %>
     </div>
 <%- end -%>
   </div>
@@ -59,14 +56,7 @@
 <%- source_files.each do |source_file| -%>
         <tr class="t-file">
           <td class="strong t-file__name"><%= link_to_source_file(source_file) %></td>
-          <td class="strong cell--number t-file__coverage">
-            <div class="coverage-bar">
-              <span class="<%= coverage_css_class(source_file.covered_percent) %>"><%= sprintf("%.2f", source_file.covered_percent.floor(2)) %>%</span>
-              <span class="coverage-bar__track">
-                <span class="coverage-bar__fill coverage-bar__fill--<%= coverage_css_class(source_file.covered_percent) %>" style="width: <%= sprintf("%.1f", source_file.covered_percent.floor(1)) %>%"></span>
-              </span>
-            </div>
-          </td>
+          <td class="strong cell--number t-file__coverage"><%= covered_percent(source_file.covered_percent) %></td>
           <td class="cell--number"><%= source_file.lines.count %></td>
           <td class="cell--number"><%= source_file.covered_lines.count + source_file.missed_lines.count %></td>
           <td class="cell--number"><%= source_file.covered_lines.count %></td>