fix tests

ZebraDevs · Oct 8, 2024 · 9cfdbd8 · 9cfdbd8
1 parent 9178c7e
commit 9cfdbd8
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 24 deletions.
diff --git a/scripts/code-connect/generate-connect-file-contents.ts b/scripts/code-connect/generate-connect-file-contents.ts
@@ -82,7 +82,7 @@ const getTemplate = (iconName: string) =>
               ts.factory.createIdentifier("props"),
               ts.factory.createIdentifier("rounded"),
             ),
-            ts.factory.createTemplateTail(`>${iconName.toLowerCase().replace(" ", "-")}</zeta-icon>`),
+            ts.factory.createTemplateTail(`>${iconName.toLowerCase().replaceAll(" ", "-")}</zeta-icon>`),
           ),
         ]),
       ),

diff --git a/scripts/fetch-icons/generators/generateDefinitionFiles.ts b/scripts/fetch-icons/generators/generateDefinitionFiles.ts
@@ -35,7 +35,7 @@ export const generateDefinitionFiles = (outputDir: string, fontData: GenerateFon
  * @returns {string} Content of `icons.g.dart`.
  */
 const generateDartFile = (fontData: GenerateFontResult): string => {
-  let dartTemplate = readFileSync("./scripts/templates/icons.dart.template").toString();
+  let dartTemplate = readFileSync("./scripts/fetch-icons/templates/icons.dart.template").toString();
   const newLine = "\n";
 
   const icons = fontData.dartDefinitions.join(newLine);
@@ -60,7 +60,7 @@ const generateDartFile = (fontData: GenerateFontResult): string => {
  * @returns {string} Content of `icon-types.ts`.
  */
 const generateTSFile = (fontData: GenerateFontResult): string => {
-  let tsTemplate = readFileSync("./scripts/templates/icon-types.ts.template").toString();
+  let tsTemplate = readFileSync("./scripts/fetch-icons/templates/icon-types.ts.template").toString();
 
   const nameList = fontData.iconNames.map((icon) => `"${icon}"`);
   const iconNames = nameList.join(",\n  ");

diff --git a/test/data/generatedFontResponse.json b/test/data/generatedFontResponse.json
diff --git a/test/fetch-icons/integration/fetchIcons.test.ts b/test/fetch-icons/integration/fetchIcons.test.ts
@@ -1,10 +1,10 @@
-import { assert } from "chai";
+import assert from "assert";
 import { ZDS_ASSETS_FILE_ID, ZDS_ASSETS_ICON_PAGE_NAME } from "../../../figmaConfig.js";
-import fetchIcons, { definitionsDir, fontDir } from "../../../scripts/fetch-icons/fetchIcons.js";
-import { checkFigmaTokenIsSet } from "../../../scripts/utils/figmaUtils.js";
-import { zdsIntegrationOutputDir } from "../../data/constants.js";
-import { existsSync, readFileSync, rmSync } from "fs";
+import { rmSync, existsSync, readFileSync } from "fs";
+import fetchIcons from "../../../scripts/fetch-icons/fetchIcons.js";
 import { IconManifest } from "../../../scripts/fetch-icons/types/customTypes.js";
+import { checkFigmaTokenIsSet } from "../../../scripts/utils/figmaUtils.js";
+import { zdsIntegrationOutputDir, testDartOutputDir, testTSOutputDir } from "../../data/constants.js";
 import { checkFontsExist, checkIconsExist } from "../utils.js";
 import { createRequire } from "module";
 const require = createRequire(import.meta.url);
@@ -25,7 +25,7 @@ describe("fetchIcons", () => {
       ZDS_ASSETS_ICON_PAGE_NAME,
       "",
       zdsIntegrationOutputDir,
-      true
+      true,
     );
   });
 
@@ -41,11 +41,15 @@ describe("fetchIcons", () => {
   });
 
   it("should create fonts", () => {
-    checkFontsExist("zeta-icons", `${zdsIntegrationOutputDir}/${fontDir}`);
+    checkFontsExist(
+      "zeta-icons",
+      `${zdsIntegrationOutputDir}/${testDartOutputDir}`,
+      `${zdsIntegrationOutputDir}/${testTSOutputDir}`,
+    );
   });
 
   it("should write definition files", () => {
-    assert.equal(existsSync(`${zdsIntegrationOutputDir}/${definitionsDir}/icons.dart`), true);
-    assert.equal(existsSync(`${zdsIntegrationOutputDir}/${definitionsDir}/icon-types.ts`), true);
+    assert.equal(existsSync(`${zdsIntegrationOutputDir}/${testDartOutputDir}/icons.g.dart`), true);
+    assert.equal(existsSync(`${zdsIntegrationOutputDir}/${testTSOutputDir}/icon-types.ts`), true);
   });
 });
diff --git a/test/fetch-icons/integration/generateDefinitionFiles.test.ts b/test/fetch-icons/integration/generateDefinitionFiles.test.ts
@@ -2,16 +2,16 @@ import { assert } from "chai";
 import { existsSync } from "fs";
 import { generateDefinitionFiles } from "../../../scripts/fetch-icons/generators/generateDefinitionFiles.js";
 import { generatedFontDefinitions, manifest } from "../../data/index.js";
-import { testDefinitionsOutputDir, testOutputDir } from "../../data/constants.js";
+import { testDartOutputDir, testOutputDir, testTSOutputDir } from "../../data/constants.js";
 
 describe("generateDefinitionFiles", () => {
   before(async () => {
-    generateDefinitionFiles(testOutputDir, testDefinitionsOutputDir, generatedFontDefinitions, manifest);
+    generateDefinitionFiles(testOutputDir, generatedFontDefinitions, manifest);
   });
 
   it("should write definition files", () => {
-    assert.equal(existsSync(`${testDefinitionsOutputDir}/icons.dart`), true);
-    assert.equal(existsSync(`${testDefinitionsOutputDir}/icon-types.ts`), true);
+    assert.equal(existsSync(`${testDartOutputDir}/icons.g.dart`), true);
+    assert.equal(existsSync(`${testTSOutputDir}/icon-types.ts`), true);
   });
 
   it("should write the icon manifest", () => {

diff --git a/test/fetch-icons/integration/generateFontFiles.test.ts b/test/fetch-icons/integration/generateFontFiles.test.ts
@@ -1,26 +1,32 @@
 import "./saveSvgs.test.js"; // Ensures saveSVGs is called before running these tests.
 
-import { optimizeSVGs } from "../../../scripts/utils/optimizeSvgs.js";
-import { testFontName, testFontsOutputDir, testIconsOutputDir, testTempOutputDir } from "../../data/constants.js";
-import { categoryNames, generatedFontDefinitions } from "../../data/index.js";
-import { GenerateFontResult } from "../../../scripts/fetch-icons/types/customTypes.js";
-import { generateFonts } from "../../../scripts/fetch-icons/generators/generateFonts.js";
 import { assert } from "chai";
 import { checkFontsExist } from "../utils.js";
+import { generateFonts } from "../../../scripts/fetch-icons/generators/generateFonts.js";
+import { GenerateFontResult } from "../../../scripts/fetch-icons/types/customTypes.js";
+import { optimizeSVGs } from "../../../scripts/utils/optimizeSvgs.js";
+import {
+  testIconsOutputDir,
+  testTempOutputDir,
+  testFontName,
+  testDartOutputDir,
+  testTSOutputDir,
+} from "../../data/constants.js";
+import { categoryNames, generatedFontDefinitions } from "../../data/index.js";
 
 describe("generateFontFiles", () => {
   let result: GenerateFontResult;
 
   before(async () => {
     await optimizeSVGs(testIconsOutputDir, testTempOutputDir, categoryNames);
-    result = await generateFonts(testTempOutputDir, testFontsOutputDir, testFontName);
+    result = await generateFonts(testTempOutputDir, testFontName, testDartOutputDir, testTSOutputDir);
   });
 
   it("should return a correct font generation result", () => {
     assert.deepEqual(result, generatedFontDefinitions);
   });
 
   it("should have created sharp and rounded ttf and woff2 files", () => {
-    checkFontsExist(testFontName, testFontsOutputDir);
+    checkFontsExist(testFontName, testDartOutputDir, testTSOutputDir);
   });
 });