Merge branch 'main' into feat/rename-insight-find

web-infra-dev · Jul 25, 2024 · 81cdd1d · 81cdd1d
2 parents d04d170 + 3444a7d
commit 81cdd1d
Show file tree

Hide file tree

Showing 30 changed files with 8 additions and 6 deletions.
diff --git a/packages/midscene/package.json b/packages/midscene/package.json
@@ -61,6 +61,7 @@
     "new": "modern new",
     "upgrade": "modern upgrade",
     "test": "vitest --run",
+    "test:all": "AITEST=true vitest --run",
     "prepublishOnly": "npm run build"
   },
   "dependencies": {

diff --git a/...__snapshots__/todo_inspector.test.ts.snap → ...__snapshots__/todo_inspector.test.ts.snap b/...__snapshots__/todo_inspector.test.ts.snap → ...__snapshots__/todo_inspector.test.ts.snap
diff --git a/..._snapshots__/xicha_inspector.test.ts.snap → ..._snapshots__/xicha_inspector.test.ts.snap b/..._snapshots__/xicha_inspector.test.ts.snap → ..._snapshots__/xicha_inspector.test.ts.snap
@@ -15,7 +15,7 @@
       },
     ],
     "error": [],
-    "prompt": "Switch language(包括中文、english内容)",
+    "prompt": "Switch language(include：中文、english text)",
   },
   {
     "elements": [

diff --git a/...t-data/githubstatus/element-snapshot.json → ...t-data/githubstatus/element-snapshot.json b/...t-data/githubstatus/element-snapshot.json → ...t-data/githubstatus/element-snapshot.json
diff --git a/...nspector/test-data/githubstatus/input.png → ...nspector/test-data/githubstatus/input.png b/...nspector/test-data/githubstatus/input.png → ...nspector/test-data/githubstatus/input.png
diff --git a/...spector/test-data/githubstatus/output.png → ...spector/test-data/githubstatus/output.png b/...spector/test-data/githubstatus/output.png → ...spector/test-data/githubstatus/output.png
diff --git a/...data/githubstatus/output_without_text.png → ...data/githubstatus/output_without_text.png b/...data/githubstatus/output_without_text.png → ...data/githubstatus/output_without_text.png
diff --git a/.../test-data/githubstatus/resize-output.png → .../test-data/githubstatus/resize-output.png b/.../test-data/githubstatus/resize-output.png → .../test-data/githubstatus/resize-output.png
diff --git a/...ctor/test-data/todo/element-snapshot.json → ...ctor/test-data/todo/element-snapshot.json b/...ctor/test-data/todo/element-snapshot.json → ...ctor/test-data/todo/element-snapshot.json
diff --git a/.../tests/inspector/test-data/todo/input.png → ...-model/inspector/test-data/todo/input.png b/.../tests/inspector/test-data/todo/input.png → ...-model/inspector/test-data/todo/input.png
diff --git a/...tests/inspector/test-data/todo/output.png → ...model/inspector/test-data/todo/output.png b/...tests/inspector/test-data/todo/output.png → ...model/inspector/test-data/todo/output.png
diff --git a/...or/test-data/todo/output_without_text.png → ...or/test-data/todo/output_without_text.png b/...or/test-data/todo/output_without_text.png → ...or/test-data/todo/output_without_text.png
diff --git a/...nspector/test-data/todo/resize-output.png → ...nspector/test-data/todo/resize-output.png b/...nspector/test-data/todo/resize-output.png → ...nspector/test-data/todo/resize-output.png
diff --git a/...t-data/visualstudio/element-snapshot.json → ...t-data/visualstudio/element-snapshot.json b/...t-data/visualstudio/element-snapshot.json → ...t-data/visualstudio/element-snapshot.json
diff --git a/...nspector/test-data/visualstudio/input.png → ...nspector/test-data/visualstudio/input.png b/...nspector/test-data/visualstudio/input.png → ...nspector/test-data/visualstudio/input.png
diff --git a/...spector/test-data/visualstudio/output.png → ...spector/test-data/visualstudio/output.png b/...spector/test-data/visualstudio/output.png → ...spector/test-data/visualstudio/output.png
diff --git a/...data/visualstudio/output_without_text.png → ...data/visualstudio/output_without_text.png b/...data/visualstudio/output_without_text.png → ...data/visualstudio/output_without_text.png
diff --git a/.../test-data/visualstudio/resize-output.png → .../test-data/visualstudio/resize-output.png b/.../test-data/visualstudio/resize-output.png → .../test-data/visualstudio/resize-output.png
diff --git a/...tor/test-data/xicha/element-snapshot.json → ...tor/test-data/xicha/element-snapshot.json b/...tor/test-data/xicha/element-snapshot.json → ...tor/test-data/xicha/element-snapshot.json
diff --git a/...tests/inspector/test-data/xicha/input.png → ...model/inspector/test-data/xicha/input.png b/...tests/inspector/test-data/xicha/input.png → ...model/inspector/test-data/xicha/input.png
diff --git a/...ests/inspector/test-data/xicha/output.png → ...odel/inspector/test-data/xicha/output.png b/...ests/inspector/test-data/xicha/output.png → ...odel/inspector/test-data/xicha/output.png
diff --git a/...r/test-data/xicha/output_without_text.png → ...r/test-data/xicha/output_without_text.png b/...r/test-data/xicha/output_without_text.png → ...r/test-data/xicha/output_without_text.png
diff --git a/...spector/test-data/xicha/resize-output.png → ...spector/test-data/xicha/resize-output.png b/...spector/test-data/xicha/resize-output.png → ...spector/test-data/xicha/resize-output.png
diff --git a/...ne/tests/inspector/todo_inspector.test.ts → ...ai-model/inspector/todo_inspector.test.ts b/...ne/tests/inspector/todo_inspector.test.ts → ...ai-model/inspector/todo_inspector.test.ts
diff --git a/packages/midscene/tests/inspector/util.ts → ...midscene/tests/ai-model/inspector/util.ts b/packages/midscene/tests/inspector/util.ts → ...midscene/tests/ai-model/inspector/util.ts
@@ -89,7 +89,7 @@ export async function runTestCases(
 
 
 export const repeat = (times: number, fn: (index: number) => void) => {
-    for (let i = 0; i < times; i++) {
+    for (let i = 1; i <= times; i++) {
       fn(i);
     }
 };

diff --git a/...e/tests/inspector/xicha_inspector.test.ts → ...i-model/inspector/xicha_inspector.test.ts b/...e/tests/inspector/xicha_inspector.test.ts → ...i-model/inspector/xicha_inspector.test.ts
@@ -9,7 +9,7 @@ const testCases = [
     multi: false,
   },
   {
-    description: 'Switch language(包括中文、english内容)',
+    description: 'Switch language(include：中文、english text)',
     multi: false,
   },
   {

diff --git a/packages/midscene/tests/openai.test.ts → ...es/midscene/tests/ai-model/openai.test.ts b/packages/midscene/tests/openai.test.ts → ...es/midscene/tests/ai-model/openai.test.ts
diff --git a/packages/midscene/tests/showcase.test.ts → .../midscene/tests/ai-model/showcase.test.ts b/packages/midscene/tests/showcase.test.ts → .../midscene/tests/ai-model/showcase.test.ts
diff --git a/packages/midscene/vitest.config.ts b/packages/midscene/vitest.config.ts
@@ -1,8 +1,9 @@
 import { defineConfig } from 'vitest/config';
 import path from 'path';
 
-const disableAiTest = true;
-const aiModelTest = disableAiTest? ['tests/inspector/*.test.ts', 'tests/openai.test.ts', 'tests/showcase.test.ts']: [];
+const enableTest = process.env.AITEST;
+
+const aiModelTest = enableTest !== 'true' ? ['tests/ai-model/**/*.test.ts']: [];
 
 export default defineConfig({
   test: {

diff --git a/packages/web-integration/tests/e2e/tool.ts b/packages/web-integration/tests/e2e/tool.ts
@@ -37,7 +37,7 @@ export async function generateTestData(page: PlaywrightPage, targetDir: string,
 export function generateTestDataPath(testDataName: string) {
   // `dist/lib/index.js` Is the default export path
   const modulePath = require.resolve('@midscene/core').replace('dist/lib/index.js', '');
-  const midsceneTestDataPath = path.join(modulePath, `tests/inspector/test-data/${testDataName}`);
+  const midsceneTestDataPath = path.join(modulePath, `tests/ai-model/inspector/test-data/${testDataName}`);
 
   return midsceneTestDataPath;
 }