Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: use <progress> and <svg> for browser progress indicator instead of <canvas> #5015

Merged
merged 12 commits into from
Mar 27, 2024
Merged

feat: use <progress> and <svg> for browser progress indicator instead of <canvas> #5015

Changes from 3 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1876f4e
Fallback for progress when canvas isn't available
yourWaifu Oct 12, 2023
9504845
Fix bugs preventing progress text from being updated
yourWaifu Oct 12, 2023
747d336
Use a different class for progress text fallback
yourWaifu Oct 12, 2023
7d41462
Refactor: replace progress canvas with text
yourWaifu Mar 4, 2024
0ff8786
refactor: add progress bar
yourWaifu Mar 6, 2024
bcba102
Merge branch 'master' into html-progress-text-fallback
yourWaifu Mar 6, 2024
214cb82
Refactor: Remove unused progress code
yourWaifu Mar 7, 2024
b174e5c
Match progress design
yourWaifu Mar 7, 2024
5ccf05c
Merge branch 'master' into html-progress-text-fallback
JoshuaKGoldberg Mar 9, 2024
8de9c39
Refactor: use css variables for ring size and color values
yourWaifu Mar 11, 2024
8deabc7
Mirror styles changes to progress ring
yourWaifu Mar 26, 2024
c236f29
Trying to match progress canvas look on progress ring
yourWaifu Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions lib/reporters/html.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ function HTML(runner, options) {
var stack = [report];
var progress;
var ctx;
var progressText;
var root = document.getElementById('mocha');

if (canvas.getContext) {
Expand All @@ -84,6 +85,12 @@ function HTML(runner, options) {
ctx = canvas.getContext('2d');
ctx.scale(ratio, ratio);
progress = new Progress();
} else {
// On some broswers, canvas might be unavailable for whatever reason.
// As such, we need a text version as a fallback
var progressTextFallback = fragment('<li class="progress-text">progress: <em>0</em>%</li>');
progressText = progressTextFallback.getElementsByTagName('em')[0];
items[0].replaceWith(progressTextFallback);
yourWaifu marked this conversation as resolved.
Show resolved Hide resolved
}

if (!root) {
Expand Down Expand Up @@ -236,6 +243,12 @@ function HTML(runner, options) {
var percent = ((stats.tests / runner.total) * 100) | 0;
if (progress) {
progress.update(percent).draw(ctx);
} else if (progressText) {
// setting a toFixed that is too low, makes small changes to progress not shown
// setting it too high, makes the progress text longer then it needs to
// to address this, calculate the toFixed based on the magnitude of total
var decmalPlaces = Math.ceil(Math.log10(runner.total/100));
text(progressText, percent.toFixed(Math.min(Math.max(decmalPlaces, 0), 100)));
}

// update stats
Expand Down
Loading