Merge pull request #757 from CloudCannon/feat/toolproof-macros

Update Toolproof to latest, adapt Toolproof macros
CloudCannon · Dec 17, 2024 · 275981e · 275981e
2 parents 99e8618 + 3a376b2
commit 275981e
Show file tree

Hide file tree

Showing 173 changed files with 228 additions and 257 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -537,7 +537,7 @@ jobs:
 
       - name: Test CLI
         if: matrix.run_tests == true
-        run: ./test_ci.sh "${{ matrix.target }}/release"
+        run: npx -y toolproof@latest -s -c 1 --timeout 45 --placeholders pagefind_mode="${{ matrix.target }}/release"
 
       - name: Move extended binary aside
         run: |

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -117,7 +117,7 @@ jobs:
         run: cargo test --release --lib --features extended
 
       - name: Test CLI
-        run: ./test_ci.sh "release"
+        run: npx -y toolproof@latest -s -c 1 --timeout 45
 
       - name: Set up poetry
         run: ./wrappers/python/scripts/ci/github/setup_poetry.sh

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -68,7 +68,7 @@ After building, you'll have a final Pagefind binary at `target/release/pagefind`
 
 ## Test suite
 
-To run the integration test suite, from the root folder run `./test_interactive.sh`.
+To run the integration test suite, from the root folder run `npx toolproof@latest`.
 This will give you a terminal interface to run tests and accept snapshot changes.
 
 From the `pagefind` directory you can run `cargo test` for unit tests.

diff --git a/pagefind/integration_tests/_macros/node.toolproof.macro.yml b/pagefind/integration_tests/_macros/node.toolproof.macro.yml
@@ -0,0 +1,3 @@
+macro: I run Pagefind Node as {file} in {dir}
+steps:
+  - I run "cd %dir% && npm i && PAGEFIND_BINARY_PATH=%toolproof_process_directory%/target/%pagefind_mode%/pagefind node %file%"
diff --git a/pagefind/integration_tests/_macros/python.toolproof.macro.yml b/pagefind/integration_tests/_macros/python.toolproof.macro.yml
@@ -0,0 +1,3 @@
+macro: I run Pagefind Python as {file} in {dir}
+steps:
+  - I run "cd %dir% && PAGEFIND_BINARY_PATH=%toolproof_process_directory%/target/%pagefind_mode%/pagefind python3 %file%"
diff --git a/pagefind/integration_tests/_macros/run.toolproof.macro.yml b/pagefind/integration_tests/_macros/run.toolproof.macro.yml
@@ -0,0 +1,3 @@
+macro: I run Pagefind
+steps:
+  - I run "%toolproof_process_directory%/target/%pagefind_mode%/pagefind"
diff --git a/pagefind/integration_tests/_macros/run_with_flags.toolproof.macro.yml b/pagefind/integration_tests/_macros/run_with_flags.toolproof.macro.yml
@@ -0,0 +1,3 @@
+macro: I run Pagefind with {flags}
+steps:
+  - I run "%toolproof_process_directory%/target/%pagefind_mode%/pagefind %flags%"
diff --git a/pagefind/integration_tests/anchors/background.toolproof.yml b/pagefind/integration_tests/anchors/background.toolproof.yml
@@ -51,7 +51,7 @@ steps:
       <!DOCTYPE html><html lang="en"><head></head><body><div data-pagefind-body>
           <h1 id="repr-heading">My <span data-pagefind-ignore>Redacted</span> Heading about Symbiosis</h1>
       </div></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: I serve the directory "public"
   - step: In my browser, I load "/"
diff --git a/pagefind/integration_tests/anchors_example/background.toolproof.yml b/pagefind/integration_tests/anchors_example/background.toolproof.yml
@@ -25,7 +25,7 @@ steps:
           <h2 id="building-from-source">Building from source</h2>
           <p>You can run <code class="inline">cargo install pagefind</code> to build from source.</p>
       </main></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: I serve the directory "public"
   - step: In my browser, I load "/"
diff --git a/pagefind/integration_tests/base/preload-indexes-then-search-for-a-word.toolproof.yml b/pagefind/integration_tests/base/preload-indexes-then-search-for-a-word.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>world</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"

diff --git a/pagefind/integration_tests/base/return-all-results.toolproof.yml b/pagefind/integration_tests/base/return-all-results.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>world</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"

diff --git a/pagefind/integration_tests/base/search-for-a-word.toolproof.yml b/pagefind/integration_tests/base/search-for-a-word.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>world</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"

diff --git a/...ration_tests/build_options/complex-exclusionary-file-glob-can-be-configured.toolproof.yml b/...ration_tests/build_options/complex-exclusionary-file-glob-can-be-configured.toolproof.yml
@@ -23,7 +23,7 @@ steps:
       lang="en"><head></head><body><h1>cat</h1></body></html>
   - step: I have a "pagefind.yml" file with the content {yml}
     yml: 'glob: "{cat/index.htm,kitty/**/*.html,cat.html}"'
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"

diff --git a/pagefind/integration_tests/build_options/file-glob-can-be-configured.toolproof.yml b/pagefind/integration_tests/build_options/file-glob-can-be-configured.toolproof.yml
@@ -11,7 +11,7 @@ steps:
       lang="en"><head></head><body><h1>world</h1></body></html>
   - step: I have a "pagefind.yml" file with the content {yml}
     yml: 'glob: "**/*.{htm,html}"'
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"

diff --git a/...tegration_tests/build_options/output-path-can-be-configured-relative-to-cwd.toolproof.yml b/...tegration_tests/build_options/output-path-can-be-configured-relative-to-cwd.toolproof.yml
@@ -9,7 +9,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>world</h1></body></html>
-  - step: I run "%pagefind_exec_path% --output-path misc/_search"
+  - macro: I run Pagefind with "--output-path misc/_search"
   - step: stdout should contain "Running Pagefind"
   - step: The file "misc/_search/pagefind.js" should not be empty
   - step: I serve the directory "."

diff --git a/...ion_tests/build_options/output-path-can-be-configured-with-an-absolute-path.toolproof.yml b/...ion_tests/build_options/output-path-can-be-configured-with-an-absolute-path.toolproof.yml
@@ -10,9 +10,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>world</h1></body></html>
-  - step: >-
-      I run "%pagefind_exec_path% --output-subdir
-      %toolproof_test_directory%/other/_search"
+  - macro: I run Pagefind with "--output-subdir %toolproof_test_directory%/other/_search"
   - step: stdout should contain "Running Pagefind"
   - step: The file "other/_search/pagefind.js" should not be empty
   - step: I serve the directory "."

diff --git a/pagefind/integration_tests/build_options/output-path-can-be-configured.toolproof.yml b/pagefind/integration_tests/build_options/output-path-can-be-configured.toolproof.yml
@@ -9,7 +9,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>world</h1></body></html>
-  - step: I run "%pagefind_exec_path% --output-subdir _search"
+  - macro: I run Pagefind with "--output-subdir _search"
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/_search/pagefind.js" should not be empty
   - step: I serve the directory "public"

diff --git a/pagefind/integration_tests/build_options/root-selector-can-be-configured.toolproof.yml b/pagefind/integration_tests/build_options/root-selector-can-be-configured.toolproof.yml
@@ -12,7 +12,7 @@ steps:
           <h1>Hello</h1>
       </div>
       <p data-pagefind-meta="ignored">Also ignored</p></body></html>
-  - step: I run "%pagefind_exec_path% --root-selector 'body > .content'"
+  - macro: I run Pagefind with "--root-selector 'body > .content'"
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"

diff --git a/pagefind/integration_tests/build_options/source-folder-can-be-configured.toolproof.yml b/pagefind/integration_tests/build_options/source-folder-can-be-configured.toolproof.yml
@@ -9,7 +9,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>world</h1></body></html>
-  - step: I run "%pagefind_exec_path% --site my_website"
+  - macro: I run Pagefind with "--site my_website"
   - step: stdout should contain "Running Pagefind"
   - step: The file "my_website/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "my_website"

diff --git a/...nd/integration_tests/characters/pagefind-can-search-for-a-hyphenated-phrase.toolproof.yml b/...nd/integration_tests/characters/pagefind-can-search-for-a-hyphenated-phrase.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html lang="en"><head></head><body><h1>The
       beet-root</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"

diff --git a/...ters/pagefind-does-not-return-results-for-queries-that-normalize-to-nothing.toolproof.yml b/...ters/pagefind-does-not-return-results-for-queries-that-normalize-to-nothing.toolproof.yml
@@ -7,7 +7,7 @@ steps:
     html: >-
       <!DOCTYPE html><html lang="en"><head></head><body><h1>Invert can before
       opening</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"

diff --git a/...gration_tests/characters/pagefind-doesn-t-match-html-entities-as-their-text.toolproof.yml b/...gration_tests/characters/pagefind-doesn-t-match-html-entities-as-their-text.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html lang="en"><head></head><body><h1>The
       &quot;bees&quot;</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"

diff --git a/pagefind/integration_tests/characters/pagefind-handles-html-entities-in-meta.toolproof.yml b/pagefind/integration_tests/characters/pagefind-handles-html-entities-in-meta.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html lang="en"><head></head><body><h1
       data-pagefind-meta="title">The &quot;bees&quot;</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"

diff --git a/pagefind/integration_tests/characters/pagefind-matches-emoji.toolproof.yml b/pagefind/integration_tests/characters/pagefind-matches-emoji.toolproof.yml
@@ -9,7 +9,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>F👨‍👩‍👧‍👦am</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"

diff --git a/pagefind/integration_tests/characters/pagefind-matches-special-characters.toolproof.yml b/pagefind/integration_tests/characters/pagefind-matches-special-characters.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>Béës</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"

diff --git a/...integration_tests/characters/punctuated-compound-words-are-indexed-per-word.toolproof.yml b/...integration_tests/characters/punctuated-compound-words-are-indexed-per-word.toolproof.yml
@@ -25,7 +25,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><p>Cloud,Cannon</p></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"

diff --git a/pagefind/integration_tests/compound_filtering/background.toolproof.yml b/pagefind/integration_tests/compound_filtering/background.toolproof.yml
@@ -62,7 +62,7 @@ steps:
       <span data-pagefind-filter="color">Orange</span>
 
       <h1>Cat</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: I serve the directory "public"
   - step: In my browser, I load "/"

diff --git a/...gration_tests/config_sources/settings-can-be-pulled-from-command-line-flags.toolproof.yml b/...gration_tests/config_sources/settings-can-be-pulled-from-command-line-flags.toolproof.yml
@@ -4,6 +4,6 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>Hello.</h1></body></html>
-  - step: I run "%pagefind_exec_path% --site public"
+  - macro: I run Pagefind with "--site public"
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
diff --git a/...tion_tests/config_sources/settings-can-be-pulled-from-environment-variables.toolproof.yml b/...tion_tests/config_sources/settings-can-be-pulled-from-environment-variables.toolproof.yml
@@ -5,6 +5,6 @@ steps:
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>Hello.</h1></body></html>
   - step: I have the environment variable "PAGEFIND_SITE" set to "public"
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
diff --git a/...n_tests/config_sources/settings-can-be-pulled-from-json-configuration-files.toolproof.yml b/...n_tests/config_sources/settings-can-be-pulled-from-json-configuration-files.toolproof.yml
@@ -9,6 +9,6 @@ steps:
       {
           "site": "public"
       }
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
diff --git a/...tegration_tests/config_sources/settings-can-be-pulled-from-multiple-sources.toolproof.yml b/...tegration_tests/config_sources/settings-can-be-pulled-from-multiple-sources.toolproof.yml
@@ -9,6 +9,6 @@ steps:
       {
           "site": "public"
       }
-  - step: I run "%pagefind_exec_path% --output-subdir _out"
+  - macro: I run Pagefind with "--output-subdir _out"
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/_out/pagefind.js" should not be empty
diff --git a/...n_tests/config_sources/settings-can-be-pulled-from-toml-configuration-files.toolproof.yml b/...n_tests/config_sources/settings-can-be-pulled-from-toml-configuration-files.toolproof.yml
@@ -6,6 +6,6 @@ steps:
       lang="en"><head></head><body><h1>Hello.</h1></body></html>
   - step: I have a "pagefind.toml" file with the content {toml}
     toml: site = "public"
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
diff --git a/...n_tests/config_sources/settings-can-be-pulled-from-yaml-configuration-files.toolproof.yml b/...n_tests/config_sources/settings-can-be-pulled-from-yaml-configuration-files.toolproof.yml
@@ -5,7 +5,7 @@ steps:
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>Hello.</h1></body></html>
   - step: I have a "pagefind.yml" file with the content {yml}
-    yml: 'site: public'
-  - step: I run "%pagefind_exec_path%"
+    yml: "site: public"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
diff --git a/pagefind/integration_tests/debounce/debounce-repeated-search-calls.toolproof.yml b/pagefind/integration_tests/debounce/debounce-repeated-search-calls.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>world</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"

diff --git a/pagefind/integration_tests/debounce/debounce-with-options.toolproof.yml b/pagefind/integration_tests/debounce/debounce-with-options.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>world</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"

diff --git a/pagefind/integration_tests/edge_cases/anchors-do-not-leak-through-metadata.toolproof.yml b/pagefind/integration_tests/edge_cases/anchors-do-not-leak-through-metadata.toolproof.yml
@@ -31,7 +31,7 @@ steps:
           </p>
       </body>
       </html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"

diff --git a/.../integration_tests/edge_cases/pagefind-doesn-t-error-on-parsing-ambiguities.toolproof.yml b/.../integration_tests/edge_cases/pagefind-doesn-t-error-on-parsing-ambiguities.toolproof.yml
@@ -9,7 +9,7 @@ steps:
     html: |-
       <!DOCTYPE html><html lang="en"><head></head><body><h1>hello world</h1>
       <select><xmp><script>"use strict";</script></select></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"

diff --git a/...nds-a-data-pagefind-body-when-elements-sit-outside-of-the-main-html-element.toolproof.yml b/...nds-a-data-pagefind-body-when-elements-sit-outside-of-the-main-html-element.toolproof.yml
@@ -21,7 +21,7 @@ steps:
       </html>
 
       <script></script>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: stdout should contain "Found a data-pagefind-body element on the site"
   - step: The file "public/pagefind/pagefind.js" should not be empty

diff --git a/...edge_cases/pagefind-handles-non-breaking-spaces-in-segmented-language-pages.toolproof.yml b/...edge_cases/pagefind-handles-non-breaking-spaces-in-segmented-language-pages.toolproof.yml
@@ -19,7 +19,7 @@ steps:
           <p>Hello&nbsp;👋</p>
       </body>
       </html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"

diff --git a/pagefind/integration_tests/edge_cases/pagefind-multilingual-sub-results.toolproof.yml b/pagefind/integration_tests/edge_cases/pagefind-multilingual-sub-results.toolproof.yml
@@ -24,7 +24,7 @@ steps:
           <p>بیرون نه می‌روی از من</p>
       </body>
       </html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"

diff --git a/...ts/exact_phrase/exact-matches-will-be-discouraged-across-element-boundaries.toolproof.yml b/...ts/exact_phrase/exact-matches-will-be-discouraged-across-element-boundaries.toolproof.yml
@@ -14,7 +14,7 @@ steps:
     html: >-
       <!DOCTYPE html><html lang="en"><head></head><body><p>Happy post about
       cats</p></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: I serve the directory "public"
   - step: In my browser, I load "/"

diff --git a/...tests/exact_phrase/searching-in-quotes-will-return-pages-with-exact-matches.toolproof.yml b/...tests/exact_phrase/searching-in-quotes-will-return-pages-with-exact-matches.toolproof.yml
@@ -11,7 +11,7 @@ steps:
     html: >-
       <!DOCTYPE html><html lang="en"><head></head><body><h1>A post about how
       cats do not like dogs</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"

diff --git a/.../integration_tests/exclusions/custom-selectors-can-be-excluded-as-an-option.toolproof.yml b/.../integration_tests/exclusions/custom-selectors-can-be-excluded-as-an-option.toolproof.yml
@@ -23,7 +23,7 @@ steps:
       exclude_selectors:
         - '[id^="g"]'
         - 'div > div'
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: I serve the directory "public"
   - step: In my browser, I load "/"

diff --git a/...s/elements-within-search-regions-can-be-excluded-from-indexing-and-excerpts.toolproof.yml b/...s/elements-within-search-regions-can-be-excluded-from-indexing-and-excerpts.toolproof.yml
@@ -21,7 +21,7 @@ steps:
       </div>
 
       <p>Huzzah!</p></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: I serve the directory "public"
   - step: In my browser, I load "/"

diff --git a/pagefind/integration_tests/exclusions/some-elements-are-excluded-automatically.toolproof.yml b/pagefind/integration_tests/exclusions/some-elements-are-excluded-automatically.toolproof.yml
@@ -24,7 +24,7 @@ steps:
       <p>Hooray!</p>
 
       <style> * { color: red; } </style></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: I serve the directory "public"
   - step: In my browser, I load "/"

diff --git a/...ion_tests/exclusions/tagged-elements-inside-ignored-elements-can-be-ignored.toolproof.yml b/...ion_tests/exclusions/tagged-elements-inside-ignored-elements-can-be-ignored.toolproof.yml
@@ -21,7 +21,7 @@ steps:
       <div data-pagefind-ignore="all">
           <p data-pagefind-meta="all">Nested content</p>
       </div></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: I serve the directory "public"
   - step: In my browser, I load "/"