fix: improve automated testing

Signed-off-by: The1111mp <The1111mp@outlook.com>
1111mp · Feb 13, 2024 · a8b319b · a8b319b
1 parent 8cbacf7
commit a8b319b
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 30 deletions.
diff --git a/electron.vite.config.ts b/electron.vite.config.ts
@@ -9,18 +9,18 @@ export default defineConfig(({ mode }) => {
   const isProd = mode === "production",
     isTest = process.env.TEST === "true";
 
-  return {
+    return {
     main: {
       clean: true,
-      entry: [isTest ? "src/main/main.test.ts" : "src/main/main.ts"],
+      entry: { main: isTest ? "src/main/main.test.ts" : "src/main/main.ts" },
       target: "node18",
       format: "esm",
       minify: isProd,
       watch: !isProd
     },
     preload: {
       clean: true,
-      entry: [isTest ? "src/preload/preload.test.ts" : "src/preload/index.ts"],
+      entry: { preload: isTest ? "src/preload/preload.test.ts" : "src/preload/index.ts" },
       format: "cjs",
       minify: isProd,
       watch: !isProd

diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
     "dev": "electron-vite-tsup dev --watch",
     "build": "electron-vite-tsup build --outDir=release/app/dist",
     "postinstall": "electron-builder install-app-deps",
-    "package": "electron-builder build --publish never",
+    "package": "npm run build && electron-builder build --publish never",
     "package:mac": "npm run build && electron-builder build --publish never --mac",
     "package:linux": "npm run build && electron-builder build --publish never --linux",
     "package:win": "npm run build && electron-builder build --publish never --win",
@@ -41,7 +41,7 @@
     "publish": "npm run build && electron-builder build --publish always",
     "publish:all": "npm run build && electron-builder build --publish always -mwl",
     "rebuild": "electron-rebuild --parallel --types prod,dev,optional --module-dir release/app",
-    "test": "wdio run ./wdio.conf.ts"
+    "test": "TS_NODE_TRANSPILE_ONLY=true wdio run ./wdio.conf.ts"
   },
   "dependencies": {
     "@electron-toolkit/preload": "^3.0.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/__tests__/specs/setting.spec.ts b/src/__tests__/specs/setting.spec.ts
@@ -21,16 +21,21 @@ describe("Module Setting", () => {
 
   describe("Language", async () => {
     it("should be set & update", async () => {
-      const defaultLocale = await (await browser.$(".ant-select-selection-item")).getText(),
+      await (await browser.$('button[data-testid="setting-trigger"]')).click();
+
+      const trigger = await browser.$('button[data-testid="language-trigger"]');
+      const defaultLocale = await browser.waitUntil(async () => {
+          return await trigger.getText();
+        }),
         selectLocale = defaultLocale === "English" ? "简体中文" : "English",
-        index = selectLocale === "English" ? 1 : 0;
+        index = defaultLocale === "English" ? 0 : 1;
+
+      await (await browser.$('button[data-testid="language-trigger"]')).click();
 
       const exist = await browser.waitUntil(
         async function () {
-          return await browser
-            .$$(".ant-select-item-option")
-            [index].$(".ant-select-item-option-content")
-            .getText();
+          const item = await browser.$$('div[data-testid="language-item"]')[index];
+          return await item.$$("span")[1].getText();
         },
         {
           timeout: 5000,
@@ -40,11 +45,13 @@ describe("Module Setting", () => {
 
       expect(exist).toHaveText(selectLocale);
 
-      await (await browser.$$(".ant-select-item-option"))[index].click();
+      await (await browser.$$('div[data-testid="language-item"]'))[index].click();
 
-      await expect(await browser.$(".ant-select-selection-item")).toHaveText(selectLocale);
+      await expect(await browser.$('button[data-testid="language-trigger"]')).toHaveText(
+        selectLocale
+      );
 
-      await (await screen.getByTestId("setting-submit")).click();
+      await (await browser.getByTestId("setting-submit")).click();
     });
   });
 

diff --git a/src/main/main.ts b/src/main/main.ts
@@ -105,9 +105,9 @@ const createWindow = async (code?: number) => {
           ? "#000000"
           : "#ffffff",
     webPreferences: {
-      preload: app.isPackaged
-        ? join(__dirname, "../preload/index.js")
-        : join(__dirname, "../../out/preload/index.js")
+            preload: app.isPackaged
+        ? join(__dirname, "../preload/preload.js")
+        : join(__dirname, "../../out/preload/preload.js")
     }
   });
 

diff --git a/src/renderer/src/components/ui/auto-complete.tsx b/src/renderer/src/components/ui/auto-complete.tsx
@@ -74,6 +74,7 @@ const AutoComplete: React.FC<AutoCompleteProps> = memo(
         <CommandInput
           ref={input}
           value={value}
+          className="h-8"
           placeholder={placeholder}
           onFocus={() => setOpen(true)}
           onBlur={() => setOpen(false)}

diff --git a/src/renderer/src/pages/home/setting.tsx b/src/renderer/src/pages/home/setting.tsx
@@ -136,6 +136,7 @@ export const Setting: React.FC<Props> = memo(({}) => {
       <SheetTrigger asChild>
         <Button
           className="nvmd-setting"
+          data-testid="setting-trigger"
           size="sm"
           title={i18n("Setting")}
           variant="ghost"
@@ -157,13 +158,20 @@ export const Setting: React.FC<Props> = memo(({}) => {
                   <FormControl>
                     <Select onValueChange={field.onChange} defaultValue={field.value}>
                       <FormControl>
-                        <SelectTrigger className="w-44 h-8">
-                          <SelectValue placeholder="Select a language to display" />
+                        <SelectTrigger data-testid="language-trigger" className="w-44 h-8">
+                          <SelectValue
+                            data-testid="language-value"
+                            placeholder="Select a language to display"
+                          />
                         </SelectTrigger>
                       </FormControl>
                       <SelectContent>
-                        <SelectItem value="zh-CN">简体中文</SelectItem>
-                        <SelectItem value="en">English</SelectItem>
+                        <SelectItem data-testid="language-item" value="zh-CN">
+                          简体中文
+                        </SelectItem>
+                        <SelectItem data-testid="language-item" value="en">
+                          English
+                        </SelectItem>
                       </SelectContent>
                     </Select>
                   </FormControl>