From cc58805a07ddbc3a40b2dda6eb1c3d19f7715330 Mon Sep 17 00:00:00 2001 From: Christophe Dervieux Date: Fri, 17 Oct 2025 16:03:57 +0200 Subject: [PATCH 1/3] Add tests for #7318 #7318 was fixed by #8430 but with no test. This is adding tests that fails without #8430 fix. This way we won't regress in the future. --- .../issues/7318-shortcode-title/.gitignore | 2 ++ .../issues/7318-shortcode-title/_quarto.yml | 7 +++++++ .../issues/7318-shortcode-title/document1.qmd | 10 ++++++++++ .../issues/7318-shortcode-title/document2.qmd | 18 ++++++++++++++++++ .../issues/7318-shortcode-title/document3.qmd | 9 +++++++++ .../issues/7318-shortcode-title/metadata.html | 3 +++ 6 files changed, 49 insertions(+) create mode 100644 tests/docs/smoke-all/issues/7318-shortcode-title/.gitignore create mode 100644 tests/docs/smoke-all/issues/7318-shortcode-title/_quarto.yml create mode 100644 tests/docs/smoke-all/issues/7318-shortcode-title/document1.qmd create mode 100644 tests/docs/smoke-all/issues/7318-shortcode-title/document2.qmd create mode 100644 tests/docs/smoke-all/issues/7318-shortcode-title/document3.qmd create mode 100644 tests/docs/smoke-all/issues/7318-shortcode-title/metadata.html diff --git a/tests/docs/smoke-all/issues/7318-shortcode-title/.gitignore b/tests/docs/smoke-all/issues/7318-shortcode-title/.gitignore new file mode 100644 index 00000000000..ad293093b07 --- /dev/null +++ b/tests/docs/smoke-all/issues/7318-shortcode-title/.gitignore @@ -0,0 +1,2 @@ +/.quarto/ +**/*.quarto_ipynb diff --git a/tests/docs/smoke-all/issues/7318-shortcode-title/_quarto.yml b/tests/docs/smoke-all/issues/7318-shortcode-title/_quarto.yml new file mode 100644 index 00000000000..5b0515633db --- /dev/null +++ b/tests/docs/smoke-all/issues/7318-shortcode-title/_quarto.yml @@ -0,0 +1,7 @@ +project: + title: "Project" + type: website +format: + html: + template-partials: + - metadata.html diff --git a/tests/docs/smoke-all/issues/7318-shortcode-title/document1.qmd b/tests/docs/smoke-all/issues/7318-shortcode-title/document1.qmd new file mode 100644 index 00000000000..e9ff18e83b8 --- /dev/null +++ b/tests/docs/smoke-all/issues/7318-shortcode-title/document1.qmd @@ -0,0 +1,10 @@ +--- +title: "Document 1" +_quarto: + tests: + html: + ensureFileRegexMatches: + - ['This text will be overwritten.'] +--- + +This is sample document 1. \ No newline at end of file diff --git a/tests/docs/smoke-all/issues/7318-shortcode-title/document2.qmd b/tests/docs/smoke-all/issues/7318-shortcode-title/document2.qmd new file mode 100644 index 00000000000..133292150eb --- /dev/null +++ b/tests/docs/smoke-all/issues/7318-shortcode-title/document2.qmd @@ -0,0 +1,18 @@ +--- +title: "Document 2" +format: + html: + template-partials: + - metadata.html +_quarto: + tests: + html: + ensureFileRegexMatches: + - ['This text will be overwritten.'] +--- + +This is sample document 2. + +The `format` metadata is redundant with that in `_quarto.yml`, +but it's here to show that if you remove those options from `_quarto.yml` +but leave them here, the bug will remain the same. diff --git a/tests/docs/smoke-all/issues/7318-shortcode-title/document3.qmd b/tests/docs/smoke-all/issues/7318-shortcode-title/document3.qmd new file mode 100644 index 00000000000..50b5a4e6e6b --- /dev/null +++ b/tests/docs/smoke-all/issues/7318-shortcode-title/document3.qmd @@ -0,0 +1,9 @@ +--- +_quarto: + tests: + html: + ensureFileRegexMatches: + - ['This text will be overwritten.'] +--- + +This is sample document 3, and this one actually works correctly! \ No newline at end of file diff --git a/tests/docs/smoke-all/issues/7318-shortcode-title/metadata.html b/tests/docs/smoke-all/issues/7318-shortcode-title/metadata.html new file mode 100644 index 00000000000..dd788d9fc67 --- /dev/null +++ b/tests/docs/smoke-all/issues/7318-shortcode-title/metadata.html @@ -0,0 +1,3 @@ +This text will be overwritten. + + From ec1bda34bfc246567d7e12ecef5da22654064c9e Mon Sep 17 00:00:00 2001 From: Christophe Dervieux Date: Fri, 17 Oct 2025 16:07:22 +0200 Subject: [PATCH 2/3] Correctly name folder --- .../{7318-shortcode-title => 7318-title-no-overwrite}/.gitignore | 0 .../{7318-shortcode-title => 7318-title-no-overwrite}/_quarto.yml | 0 .../document1.qmd | 0 .../document2.qmd | 0 .../document3.qmd | 0 .../metadata.html | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename tests/docs/smoke-all/issues/{7318-shortcode-title => 7318-title-no-overwrite}/.gitignore (100%) rename tests/docs/smoke-all/issues/{7318-shortcode-title => 7318-title-no-overwrite}/_quarto.yml (100%) rename tests/docs/smoke-all/issues/{7318-shortcode-title => 7318-title-no-overwrite}/document1.qmd (100%) rename tests/docs/smoke-all/issues/{7318-shortcode-title => 7318-title-no-overwrite}/document2.qmd (100%) rename tests/docs/smoke-all/issues/{7318-shortcode-title => 7318-title-no-overwrite}/document3.qmd (100%) rename tests/docs/smoke-all/issues/{7318-shortcode-title => 7318-title-no-overwrite}/metadata.html (100%) diff --git a/tests/docs/smoke-all/issues/7318-shortcode-title/.gitignore b/tests/docs/smoke-all/issues/7318-title-no-overwrite/.gitignore similarity index 100% rename from tests/docs/smoke-all/issues/7318-shortcode-title/.gitignore rename to tests/docs/smoke-all/issues/7318-title-no-overwrite/.gitignore diff --git a/tests/docs/smoke-all/issues/7318-shortcode-title/_quarto.yml b/tests/docs/smoke-all/issues/7318-title-no-overwrite/_quarto.yml similarity index 100% rename from tests/docs/smoke-all/issues/7318-shortcode-title/_quarto.yml rename to tests/docs/smoke-all/issues/7318-title-no-overwrite/_quarto.yml diff --git a/tests/docs/smoke-all/issues/7318-shortcode-title/document1.qmd b/tests/docs/smoke-all/issues/7318-title-no-overwrite/document1.qmd similarity index 100% rename from tests/docs/smoke-all/issues/7318-shortcode-title/document1.qmd rename to tests/docs/smoke-all/issues/7318-title-no-overwrite/document1.qmd diff --git a/tests/docs/smoke-all/issues/7318-shortcode-title/document2.qmd b/tests/docs/smoke-all/issues/7318-title-no-overwrite/document2.qmd similarity index 100% rename from tests/docs/smoke-all/issues/7318-shortcode-title/document2.qmd rename to tests/docs/smoke-all/issues/7318-title-no-overwrite/document2.qmd diff --git a/tests/docs/smoke-all/issues/7318-shortcode-title/document3.qmd b/tests/docs/smoke-all/issues/7318-title-no-overwrite/document3.qmd similarity index 100% rename from tests/docs/smoke-all/issues/7318-shortcode-title/document3.qmd rename to tests/docs/smoke-all/issues/7318-title-no-overwrite/document3.qmd diff --git a/tests/docs/smoke-all/issues/7318-shortcode-title/metadata.html b/tests/docs/smoke-all/issues/7318-title-no-overwrite/metadata.html similarity index 100% rename from tests/docs/smoke-all/issues/7318-shortcode-title/metadata.html rename to tests/docs/smoke-all/issues/7318-title-no-overwrite/metadata.html From d6e1634e98296062d7ec284ca69fe6bc2aa0d8e1 Mon Sep 17 00:00:00 2001 From: Christophe Dervieux Date: Fri, 17 Oct 2025 16:17:49 +0200 Subject: [PATCH 3/3] Add test for shortcode resolution in title Check also we do not duplicate website title --- .../smoke-all/website/title-shortcode/.gitignore | 2 ++ .../smoke-all/website/title-shortcode/_quarto.yml | 14 ++++++++++++++ .../smoke-all/website/title-shortcode/about.qmd | 10 ++++++++++ .../smoke-all/website/title-shortcode/index.qmd | 10 ++++++++++ 4 files changed, 36 insertions(+) create mode 100644 tests/docs/smoke-all/website/title-shortcode/.gitignore create mode 100644 tests/docs/smoke-all/website/title-shortcode/_quarto.yml create mode 100644 tests/docs/smoke-all/website/title-shortcode/about.qmd create mode 100644 tests/docs/smoke-all/website/title-shortcode/index.qmd diff --git a/tests/docs/smoke-all/website/title-shortcode/.gitignore b/tests/docs/smoke-all/website/title-shortcode/.gitignore new file mode 100644 index 00000000000..ad293093b07 --- /dev/null +++ b/tests/docs/smoke-all/website/title-shortcode/.gitignore @@ -0,0 +1,2 @@ +/.quarto/ +**/*.quarto_ipynb diff --git a/tests/docs/smoke-all/website/title-shortcode/_quarto.yml b/tests/docs/smoke-all/website/title-shortcode/_quarto.yml new file mode 100644 index 00000000000..e993b7f780b --- /dev/null +++ b/tests/docs/smoke-all/website/title-shortcode/_quarto.yml @@ -0,0 +1,14 @@ +project: + type: website + +website: + title: "shortcode in title" + navbar: + left: + - href: index.qmd + text: Home + - about.qmd + +format: html + +custom-title-about: "YOLO" diff --git a/tests/docs/smoke-all/website/title-shortcode/about.qmd b/tests/docs/smoke-all/website/title-shortcode/about.qmd new file mode 100644 index 00000000000..037fc2f7d6e --- /dev/null +++ b/tests/docs/smoke-all/website/title-shortcode/about.qmd @@ -0,0 +1,10 @@ +--- +title: "{{< meta custom-title-about >}} Page" +_quarto: + tests: + html: + ensureFileRegexMatches: + - ['YOLO Page – shortcode in title'] +--- + +This page should have shortcode in title resolved from the `_quarto.yml` metadata. diff --git a/tests/docs/smoke-all/website/title-shortcode/index.qmd b/tests/docs/smoke-all/website/title-shortcode/index.qmd new file mode 100644 index 00000000000..a8c2840674b --- /dev/null +++ b/tests/docs/smoke-all/website/title-shortcode/index.qmd @@ -0,0 +1,10 @@ +--- +title: "shortcode in title" +_quarto: + tests: + html: + ensureFileRegexMatches: + - ['shortcode in title'] +--- + +Title is same as website title, and should not be repeated.