Skip to content

Fix stale presenter after expected operation errors #2589

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

Merged
GCHQDeveloper581 merged 3 commits into from
Jun 24, 2026
Merged

Fix stale presenter after expected operation errors #2589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a226e5
Fix stale presenter after expected operation errors
zainnadeem786 Jun 22, 2026
c5394de
Slightly simplify tests
GCHQDeveloper581 Jun 24, 2026
f7ec562
Merge branch 'master' into fix/render-pdf-error-presentation
GCHQDeveloper581 Jun 24, 2026
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
2 changes: 2 additions & 0 deletions src/core/Recipe.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,11 @@ class Recipe {
// Cannot rely on `err instanceof OperationError` here as extending
// native types is not fully supported yet.
dish.set(err.message, "string");
this.lastRunOp = null;
return i;
} else if (err instanceof DishError || err?.type === "DishError") {
dish.set(err.message, "string");
this.lastRunOp = null;
return i;
} else {
const e = typeof err == "string" ? { message: err } : err;
Expand Down
18 changes: 18 additions & 0 deletions tests/operations/tests/RenderPDF.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
import TestRegister from "../../lib/TestRegister.mjs";


const oversizedPdfLikeInput = "%PDF-1.0\n" + "A".repeat(5000);


TestRegister.addTests([
{
name: "RenderPDF",
Expand Down Expand Up @@ -34,4 +37,19 @@ TestRegister.addTests([
}
],
},
{
name: "RenderPDF followed by Generate QR Code error returns plain text",
input: oversizedPdfLikeInput,
expectedOutput: "Error generating QR code. (Error: Too much data)",
recipeConfig: [
{
"op": "Render PDF",
"args": ["Raw"]
},
{
"op": "Generate QR Code",
"args": ["PNG", 1, 0, "High"]
}
],
},
]);
Loading