From c1fafe67c40362dab7e19b2bfa7f93b89cca8ef0 Mon Sep 17 00:00:00 2001
From: Lucas Colombo <lucasncolombo@gmail.com>
Date: Thu, 25 Apr 2024 12:20:52 -0300
Subject: [PATCH] =?UTF-8?q?test:=20=F0=9F=A7=AA=20fix=20failing=20tests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/icons/generator/clones/fileClone.ts            |  4 ++--
 src/icons/generator/clones/folderClone.ts          |  4 ++--
 .../generator/clones/utils/{svg.ts => cloning.ts}  | 14 +++++++++++++-
 src/icons/generator/clones/utils/color/colors.ts   |  2 +-
 src/models/iconConfiguration.ts                    |  4 ----
 src/test/runTest.ts                                |  2 +-
 6 files changed, 19 insertions(+), 11 deletions(-)
 rename src/icons/generator/clones/utils/{svg.ts => cloning.ts} (90%)

diff --git a/src/icons/generator/clones/fileClone.ts b/src/icons/generator/clones/fileClone.ts
index 89ba455646..bac941eecb 100644
--- a/src/icons/generator/clones/fileClone.ts
+++ b/src/icons/generator/clones/fileClone.ts
@@ -7,7 +7,7 @@ import {
   FileIconType,
 } from './utils/paths';
 import { iconFolderPath } from '../constants';
-import { cloneIcon } from './utils/svg';
+import { cloneIcon, createCloneConfig } from './utils/cloning';
 import { writeFileSync } from 'fs';
 
 export function cloneFileIcon(
@@ -28,7 +28,7 @@ function createFileIconClones(
   basePaths: IconPath<FileIconType>[],
   hash: string
 ): IconConfiguration {
-  const config: IconConfiguration = new IconConfiguration();
+  const config = createCloneConfig();
 
   basePaths.forEach((base) => {
     try {
diff --git a/src/icons/generator/clones/folderClone.ts b/src/icons/generator/clones/folderClone.ts
index 017f6ea2aa..8f7430f7e4 100644
--- a/src/icons/generator/clones/folderClone.ts
+++ b/src/icons/generator/clones/folderClone.ts
@@ -7,7 +7,7 @@ import {
   getFolderIconClonePath,
 } from './utils/paths';
 import { iconFolderPath } from '../constants';
-import { cloneIcon } from './utils/svg';
+import { cloneIcon, createCloneConfig } from './utils/cloning';
 import { writeFileSync } from 'fs';
 
 export function cloneFolderIcon(
@@ -28,7 +28,7 @@ function createFolderClones(
   basePaths: IconPath<FolderIconType>[],
   hash: string
 ): IconConfiguration {
-  const config: IconConfiguration = new IconConfiguration();
+  const config = createCloneConfig();
 
   basePaths.forEach((base) => {
     try {
diff --git a/src/icons/generator/clones/utils/svg.ts b/src/icons/generator/clones/utils/cloning.ts
similarity index 90%
rename from src/icons/generator/clones/utils/svg.ts
rename to src/icons/generator/clones/utils/cloning.ts
index a7f2c28386..7cbf06792d 100644
--- a/src/icons/generator/clones/utils/svg.ts
+++ b/src/icons/generator/clones/utils/cloning.ts
@@ -1,6 +1,6 @@
 import { readFileSync } from 'fs';
 import { INode, parseSync, stringify } from 'svgson';
-import { CustomClone } from '../../../../models';
+import { CustomClone, IconConfiguration } from '../../../../models';
 import { getColorList, replacementMap } from './color/colors';
 
 export function traverse(node: INode, callback: (node: INode) => void) {
@@ -91,3 +91,15 @@ export function replaceColors(node: INode, replacements: Map<string, string>) {
     }
   });
 }
+
+export function createCloneConfig() {
+  const config = new IconConfiguration();
+  config.light = {
+    fileExtensions: {},
+    fileNames: {},
+    folderNames: {},
+    folderNamesExpanded: {},
+  };
+
+  return config;
+}
diff --git a/src/icons/generator/clones/utils/color/colors.ts b/src/icons/generator/clones/utils/color/colors.ts
index 3e89263be8..9c892444f4 100644
--- a/src/icons/generator/clones/utils/color/colors.ts
+++ b/src/icons/generator/clones/utils/color/colors.ts
@@ -1,5 +1,5 @@
 import { INode } from 'svgson';
-import { getStyle, traverse } from '../svg';
+import { getStyle, traverse } from '../cloning';
 import chroma, { valid } from 'chroma-js';
 import {
   closerMaterialColorTo,
diff --git a/src/models/iconConfiguration.ts b/src/models/iconConfiguration.ts
index c50de1b79e..00ea4bab9a 100644
--- a/src/models/iconConfiguration.ts
+++ b/src/models/iconConfiguration.ts
@@ -27,14 +27,10 @@ export class IconConfiguration {
     this.light = {
       fileExtensions: {},
       fileNames: {},
-      folderNames: {},
-      folderNamesExpanded: {},
     };
     this.highContrast = {
       fileExtensions: {},
       fileNames: {},
-      folderNames: {},
-      folderNamesExpanded: {},
     };
     this.options = {};
   }
diff --git a/src/test/runTest.ts b/src/test/runTest.ts
index f8a69a0b1e..69491bb706 100644
--- a/src/test/runTest.ts
+++ b/src/test/runTest.ts
@@ -1,5 +1,5 @@
 import { resolve } from 'path';
-import { runTests } from 'vscode-test';
+import { runTests } from '@vscode/test-electron';
 
 const main = async () => {
   try {