Do not use profile for testing variation of website

cderv · cderv · commit 0e6a2c9e0761 · 2024-11-07T20:43:10.000+01:00
It does not currently work because setting env var for a test is not safe as several Deno.test() can conflict with one another setup and teardown. Environment is not isolated between tests.

So use two duplicated projects with different config for the test
diff --git a/tests/docs/search/issue-9905/.gitignore b/tests/docs/search/issue-9905/.gitignore
@@ -1,2 +1,2 @@
-/.quarto/
-/_site
+.quarto/
+_site/
diff --git a/tests/docs/search/issue-9905/_quarto-navbar-search.yml b/tests/docs/search/issue-9905/_quarto-navbar-search.yml
diff --git a/tests/docs/search/issue-9905/_quarto-sidebar-search.yml b/tests/docs/search/issue-9905/_quarto-sidebar-search.yml
diff --git a/tests/docs/search/issue-9905/_quarto.yml b/tests/docs/search/issue-9905/_quarto.yml
diff --git a/tests/docs/search/issue-9905/navbar/.gitignore b/tests/docs/search/issue-9905/navbar/.gitignore
@@ -0,0 +1 @@
+/.quarto/
diff --git a/tests/docs/search/issue-9905/navbar/_quarto.yml b/tests/docs/search/issue-9905/navbar/_quarto.yml
@@ -1,8 +1,14 @@
+project:
+  type: website
+
 website:
+  title: "search opt out"
   search:
     location: sidebar
   navbar:
     search: false
     left:
       - href: index.qmd
         text: Home
+
+format: html
diff --git a/tests/docs/search/issue-9905/navbar/index.qmd b/tests/docs/search/issue-9905/navbar/index.qmd
diff --git a/tests/docs/search/issue-9905/sidebar/.gitignore b/tests/docs/search/issue-9905/sidebar/.gitignore
@@ -0,0 +1 @@
+/.quarto/
diff --git a/tests/docs/search/issue-9905/sidebar/_quarto.yml b/tests/docs/search/issue-9905/sidebar/_quarto.yml
@@ -1,4 +1,8 @@
+project:
+  type: website
+
 website:
+  title: "search opt out"
   search:
     location: sidebar
   sidebar:
@@ -7,3 +11,5 @@ website:
       - section: "Basics"
         contents:
           - index.qmd
+
+format: html
diff --git a/tests/docs/search/issue-9905/sidebar/index.qmd b/tests/docs/search/issue-9905/sidebar/index.qmd
@@ -0,0 +1,7 @@
+---
+title: "search opt out"
+---
+
+This is a Quarto website.
+
+To learn more about Quarto websites visit <https://quarto.org/docs/websites>.
diff --git a/tests/smoke/site/site.ts b/tests/smoke/site/site.ts
@@ -42,25 +42,3 @@ export const testSite = (
     mergeTestContexts(baseContext, additionalContext),
   );
 };
-
-export function testSiteWithProfile(profile: string) {
-  return (
-    input: string,
-    renderTarget: string,
-    includeSelectors: string[],
-    excludeSelectors: string[],
-    ...verify: Verify[]
-  ) => {
-    let profileEnv: string | undefined;
-    const additionalContext: TestContext = {
-      name: `with profile: ${profile}`,
-      setup: async () => {
-        profileEnv = setEnvVar("QUARTO_PROFILE", profile);
-      },
-      teardown: async () => {
-        restoreEnvVar("QUARTO_PROFILE", profileEnv);
-      }
-    }
-      testSite(input, renderTarget, includeSelectors, excludeSelectors, additionalContext, ...verify);
-  };
-}
diff --git a/tests/smoke/website/search.test.ts b/tests/smoke/website/search.test.ts
@@ -5,12 +5,8 @@
 *
 */
 import { docs } from "../../utils.ts";
-import { testSiteWithProfile } from "../site/site.ts";
-
-// Chain the tests sequentially
-testSiteWithProfile("navbar-search")(docs("search/issue-9905/index.qmd"), docs("search/issue-9905/"), ["div#quarto-search"], [])
-testSiteWithProfile("sidebar-search")(docs("search/issue-9905/index.qmd"), docs("search/issue-9905/"), ["div#quarto-search"], [])
-testSiteWithProfile("navbar-no-search")(docs("search/issue-9905/index.qmd"), docs("search/issue-9905/"), [], ["div#quarto-search"])
-testSiteWithProfile("sidebar-no-search")(docs("search/issue-9905/index.qmd"), docs("search/issue-9905/"), [], ["div.sidebar-search"]);
+import { testSite } from "../site/site.ts";
 
+await testSite(docs("search/issue-9905/navbar/index.qmd"), docs("search/issue-9905/navbar"), [], ["div#quarto-search"])
+await testSite(docs("search/issue-9905/sidebar/index.qmd"), docs("search/issue-9905/sidebar"), [], ["div.sidebar-search"]);
 

-Original file line number
+Diff line change
@@ @@ -1,2 +1,2 @@ @@
 -/.quarto/
 -/_site
 +.quarto/
 +_site/