From dc05ced3a387331d04da1c52224fa4a40b6f1bdc Mon Sep 17 00:00:00 2001
From: Florian Dieminger <me@fiji-flo.de>
Date: Mon, 24 Jun 2024 13:12:41 +0200
Subject: [PATCH 1/3] chore(macros): remove page macro

the page macro has been deprecated and is broken anyway
---
 kumascript/macros/page.ejs                    | 27 --------
 .../css_layout/introduction/flex/index.html   | 22 ------
 .../introduction/flex/stuff/index.html        | 69 -------------------
 .../css/css_layout/introduction/index.html    |  5 --
 testing/tests/headless.index.spec.ts          | 55 ---------------
 5 files changed, 178 deletions(-)
 delete mode 100644 kumascript/macros/page.ejs
 delete mode 100644 testing/content/files/en-us/learn/css/css_layout/introduction/flex/index.html
 delete mode 100644 testing/content/files/en-us/learn/css/css_layout/introduction/flex/stuff/index.html

diff --git a/kumascript/macros/page.ejs b/kumascript/macros/page.ejs
deleted file mode 100644
index e88539a05a6c..000000000000
--- a/kumascript/macros/page.ejs
+++ /dev/null
@@ -1,27 +0,0 @@
-<%
-// Inserts the contents of a page into the document. This process is often
-// referred to as "transclusion."
-//
-// Parameters:
-//
-//  $0 - URL of page to insert. Example: "/en-US/docs". Do not use https://etc.
-//  $1 - (optional) section name of a section to transclude (rather than the whole page)
-//       Can be a section title like "Quick Start", can also be an id attribute
-//       like this: <div id="grabme">
-//       Example: {{Page("/en-US/docs/MyPage", "grabme")}}
-//  $2 - (optional) revision number to pull from. UNSUPPORTED.
-//  $3 - (optional) whether or not to show the first heading. Defaults to false.
-//  $4 - (optional) the heading level to use as the top heading level; others
-//       are adjusted to match.
-
-// Throw a MacroDeprecatedError flaw
-// Can be removed when its usage translated-content is down to 0
-mdn.deprecated();
-
-var url = web.spacesToUnderscores($0);
-
-if ($1) {
-    $1 = web.spacesToUnderscores($1).toLowerCase();
-}
-%>
-<%- await wiki.page(url, $1, $2, $3, $4) %>
diff --git a/testing/content/files/en-us/learn/css/css_layout/introduction/flex/index.html b/testing/content/files/en-us/learn/css/css_layout/introduction/flex/index.html
deleted file mode 100644
index 1c9b765f63a6..000000000000
--- a/testing/content/files/en-us/learn/css/css_layout/introduction/flex/index.html
+++ /dev/null
@@ -1,22 +0,0 @@
----
-title: A Test Introduction to CSS Flexbox Layout
-slug: Learn/CSS/CSS_layout/Introduction/Flex
-tags:
-  - Examples
-  - Beginner
-  - CSS
-  - Layout
-  - Learn
-  - flexbox
----
-<h2 id="Flexbox">Flexbox</h2>
-<!--
-Grab the content of the live samples from a different page. This tests
-that the page must be fully rendered before extracting the live samples,
-and also tests that prerequisites are handled as part of the rendering
-and live-sample-building process.
--->
-<div id="Flex_1">{{ Page("Learn/CSS/CSS_layout/Introduction/Flex/Stuff", "Flex_1") }}</div>
-<p>{{ EmbedLiveSample('Flex_1', '300', '200') }}</p>
-<div id="Flex_2">{{ Page("Learn/CSS/CSS_layout/Introduction/Flex/Stuff", "Flex_2") }}</div>>
-<p>{{ EmbedLiveSample('Flex_2', '300', '200') }}</p>
diff --git a/testing/content/files/en-us/learn/css/css_layout/introduction/flex/stuff/index.html b/testing/content/files/en-us/learn/css/css_layout/introduction/flex/stuff/index.html
deleted file mode 100644
index dd87b74c8c64..000000000000
--- a/testing/content/files/en-us/learn/css/css_layout/introduction/flex/stuff/index.html
+++ /dev/null
@@ -1,69 +0,0 @@
----
-title: Stuff for CSS Flex layout
-slug: Learn/CSS/CSS_layout/Introduction/Flex/Stuff
-tags:
-  - Stuff
-  - Beginner
-  - CSS
-  - Introduction
-  - Layout
-  - Learn
-  - flexbox
----
-<div id="Flex_1">
-<div class="hidden">
-<h6 id="Flexbox_Example_1">Flexbox Example 1</h6>
-
-<pre class="brush: css hidden">* {box-sizing: border-box;}
-
-.wrapper &gt; div {
-    border-radius: 5px;
-    background-color: rgb(207,232,220);
-    padding: 1em;
-}
-    </pre>
-</div>
-
-<pre class="brush: css">.wrapper {
-  display: flex;
-}
-</pre>
-
-<pre class="brush: html">&lt;div class="wrapper"&gt;
-  &lt;div class="box1"&gt;One&lt;/div&gt;
-  &lt;div class="box2"&gt;Two&lt;/div&gt;
-  &lt;div class="box3"&gt;Three&lt;/div&gt;
-&lt;/div&gt;
-</pre>
-</div>
-
-<div id="Flex_2">
-<div class="hidden">
-<h6 id="Flexbox_Example_2">Flexbox Example 2</h6>
-
-<pre class="brush: css hidden">    * {box-sizing: border-box;}
-
-    .wrapper &gt; div {
-        border-radius: 5px;
-        background-color: rgb(207,232,220);
-        padding: 1em;
-    }
-    </pre>
-</div>
-
-<pre class="brush: css">.wrapper {
-    display: flex;
-}
-
-.wrapper &gt; div {
-    flex: 1;
-}
-</pre>
-
-<pre class="brush: html">&lt;div class="wrapper"&gt;
-    &lt;div class="box1"&gt;One&lt;/div&gt;
-    &lt;div class="box2"&gt;Two&lt;/div&gt;
-    &lt;div class="box3"&gt;Three&lt;/div&gt;
-&lt;/div&gt;
-</pre>
-</div>
diff --git a/testing/content/files/en-us/learn/css/css_layout/introduction/index.html b/testing/content/files/en-us/learn/css/css_layout/introduction/index.html
index cc189398374d..84f139c1a5d1 100644
--- a/testing/content/files/en-us/learn/css/css_layout/introduction/index.html
+++ b/testing/content/files/en-us/learn/css/css_layout/introduction/index.html
@@ -23,12 +23,7 @@
 and some from other pages.
 -->
 
-<h2 id="Flexbox">Flexbox</h2>
-<p>{{ EmbedLiveSample('Flex_1', '300', '200', "", "Learn/CSS/CSS_layout/Introduction/Flex") }}</p>
-<p>{{ EmbedLiveSample('Flex_2', '300', '200', "", "Learn/CSS/CSS_layout/Introduction/Flex") }}</p>
-
 <h2 id="Grid_Layout">Grid Layout</h2>
-<p>{{ EmbedLiveSample('Grid_1', '300', '330', "", "Learn/CSS/CSS_layout/Introduction/Grid") }}</p>
 <div id="Grid_2">
 <div class="hidden">
 <h6 id="Grid_example_2">Grid example 2</h6>
diff --git a/testing/tests/headless.index.spec.ts b/testing/tests/headless.index.spec.ts
index e80c53b6ca72..198a2f63b490 100644
--- a/testing/tests/headless.index.spec.ts
+++ b/testing/tests/headless.index.spec.ts
@@ -48,9 +48,6 @@ test.describe("Basic viewing of functional pages", () => {
     page,
   }) => {
     const uri = "/en-US/docs/Learn/CSS/CSS_layout/Introduction";
-    const flexSample1Uri = liveSampleURL(`${uri}/Flex`, "flex_1", true);
-    const flexSample2Uri = liveSampleURL(`${uri}/Flex`, "flex_2", true);
-    const gridSample1Uri = liveSampleURL(`${uri}/Grid`, "grid_1", true);
     const gridSample2Uri = liveSampleURL(uri, "grid_2");
     await page.goto(testURL(uri));
     expect(await page.title()).toContain("A Test Introduction to CSS layout");
@@ -58,64 +55,12 @@ test.describe("Basic viewing of functional pages", () => {
       "A Test Introduction to CSS layout"
     );
     expect(await page.innerText("#flexbox")).toBe("Flexbox");
-    expect(
-      await page.isVisible(`iframe.sample-code-frame[src$="${flexSample1Uri}"]`)
-    ).toBeTruthy();
-    expect(
-      await page.isVisible(`iframe.sample-code-frame[src$="${flexSample2Uri}"]`)
-    ).toBeTruthy();
-    expect(await page.innerText("#grid_layout")).toBe("Grid Layout");
-    expect(
-      await page.isVisible(`iframe.sample-code-frame[src$="${gridSample1Uri}"]`)
-    ).toBeTruthy();
     expect(
       await page.innerText("#grid_2 pre.css.notranslate:not(.hidden)")
     ).toMatch(/\.wrapper\s*\{\s*display:\s*grid;/);
     expect(
       await page.isVisible(`iframe.sample-code-frame[src$="${gridSample2Uri}"]`)
     ).toBeTruthy();
-
-    // Ensure that the legacy live-sample pages were built.
-    for (const sampleUri of [flexSample1Uri, flexSample2Uri, gridSample1Uri]) {
-      await page.goto(testURL(sampleUri));
-      expect(await page.innerText("body > div.wrapper > div.box1")).toBe("One");
-      expect(await page.innerText("body > div.wrapper > div.box2")).toBe("Two");
-      expect(await page.innerText("body > div.wrapper > div.box3")).toBe(
-        "Three"
-      );
-    }
-  });
-
-  test("open the /en-US/docs/Learn/CSS/CSS_layout/Introduction/Flex page", async ({
-    page,
-  }) => {
-    const uri = "/en-US/docs/Learn/CSS/CSS_layout/Introduction/Flex";
-    const flexSample1Uri = liveSampleURL(uri, "flex_1");
-    const flexSample2Uri = liveSampleURL(uri, "flex_2");
-    await page.goto(testURL(uri));
-    expect(await page.title()).toContain(
-      "A Test Introduction to CSS Flexbox Layout"
-    );
-    expect(await page.innerText("h1")).toBe(
-      "A Test Introduction to CSS Flexbox Layout"
-    );
-    expect(await page.innerText("#flexbox")).toBe("Flexbox");
-
-    expect(
-      await page.innerText("#flex_1 pre.css.notranslate:not(.hidden)")
-    ).toMatch(/\.wrapper\s*\{\s*display:\s*flex;\s*\}/);
-    expect(
-      await page.isVisible(`iframe.sample-code-frame[src$="${flexSample1Uri}"]`)
-    ).toBeTruthy();
-
-    expect(
-      await page.innerText("#flex_2 pre.css.notranslate:not(.hidden)")
-    ).toMatch(
-      /\.wrapper {\s*display: flex;\s*\}\s*\.wrapper > div \{\s*flex: 1;\s*\}/
-    );
-    expect(
-      await page.isVisible(`iframe.sample-code-frame[src$="${flexSample2Uri}"]`)
-    ).toBeTruthy();
   });
 
   test("open the /en-US/docs/Learn/CSS/CSS_layout/Introduction/Grid page", async ({

From 70e6983e6f10cf3c35a21747cc0643913243c4de Mon Sep 17 00:00:00 2001
From: Florian Dieminger <me@fiji-flo.de>
Date: Wed, 26 Jun 2024 15:10:52 +0200
Subject: [PATCH 2/3] remove more tests

---
 testing/tests/index.test.ts | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/testing/tests/index.test.ts b/testing/tests/index.test.ts
index 9eded792f560..1f12e5beb57e 100644
--- a/testing/tests/index.test.ts
+++ b/testing/tests/index.test.ts
@@ -908,27 +908,6 @@ test("check built flaws for /en-us/learn/css/css_layout/introduction/grid page",
   expect(doc.flaws).toEqual({});
 });
 
-test("check built flaws for /en-us/learn/css/css_layout/introduction/flex page", () => {
-  expect(fs.existsSync(buildRoot)).toBeTruthy();
-  const builtFolder = path.join(
-    buildRoot,
-    "en-us",
-    "docs",
-    "learn",
-    "css",
-    "css_layout",
-    "introduction",
-    "flex"
-  );
-  expect(fs.existsSync(builtFolder)).toBeTruthy();
-
-  const htmlFile = path.join(builtFolder, "index.html");
-  const html = fs.readFileSync(htmlFile, "utf-8");
-  const $ = cheerio.load(html);
-  // The css_layout/introduction/flex page has 2 iframes
-  expect($('iframe[loading="lazy"]')).toHaveLength(2);
-});
-
 test("detect bad_bcd_queries flaws", () => {
   const builtFolder = path.join(
     buildRoot,

From 7c3fb74cf0f267e4c8406c2a3dba86df002add26 Mon Sep 17 00:00:00 2001
From: Florian Dieminger <me@fiji-flo.de>
Date: Wed, 26 Jun 2024 15:18:26 +0200
Subject: [PATCH 3/3] remove more tests

---
 testing/tests/headless.index.spec.ts | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/testing/tests/headless.index.spec.ts b/testing/tests/headless.index.spec.ts
index 97b6f09bed93..256b86821fea 100644
--- a/testing/tests/headless.index.spec.ts
+++ b/testing/tests/headless.index.spec.ts
@@ -44,25 +44,6 @@ test.describe("Basic viewing of functional pages", () => {
     ).toBeTruthy();
   });
 
-  test("open the /en-US/docs/Learn/CSS/CSS_layout/Introduction page", async ({
-    page,
-  }) => {
-    const uri = "/en-US/docs/Learn/CSS/CSS_layout/Introduction";
-    const gridSample2Uri = liveSampleURL(uri, "grid_2");
-    await page.goto(testURL(uri));
-    expect(await page.title()).toContain("A Test Introduction to CSS layout");
-    expect(await page.innerText("h1")).toBe(
-      "A Test Introduction to CSS layout"
-    );
-    expect(await page.innerText("#flexbox")).toBe("Flexbox");
-    expect(
-      await page.innerText("#grid_2 pre.css.notranslate:not(.hidden)")
-    ).toMatch(/\.wrapper\s*\{\s*display:\s*grid;/);
-    expect(
-      await page.isVisible(`iframe.sample-code-frame[src$="${gridSample2Uri}"]`)
-    ).toBeTruthy();
-  });
-
   test("open the /en-US/docs/Learn/CSS/CSS_layout/Introduction/Grid page", async ({
     page,
   }) => {