更新依赖库

.gitignore

@@ -1,3 +1,7 @@
 node_modules/
 coverage/
 *.log
+
+# tests
+test-results/
+playwright-report/

.mocharc.json

@@ -1,4 +0,0 @@
-{
-    "require":"ts-node/register",
-    "spec":"./tests/**/*.ts"
-}

.npmrc

@@ -0,0 +1 @@
+registry=https://registry.npmmirror.com

.vscode/extensions.json

@@ -0,0 +1,6 @@
+{
+    "recommendations": [
+        "ms-playwright.playwright",
+    ],
+    "unwantedRecommendations": []
+}

README.md

@@ -1,2 +1,15 @@
-### playwright-demo
+## playwright-demo
 
+### 依赖工具
+* GIT
+* vscode
+* nodejs
+* vscode playwright 插件
+
+### 安装依赖
+```
+corepack enable
+pnpm install
+pnpm init
+pnpm run test
+```

package.json

@@ -4,19 +4,17 @@
   "description": "",
   "main": "demo.js",
   "scripts": {
-    "init":"playwright install",
+    "init": "playwright install",
-    "codegen":"playwright codegen",
+    "codegen": "playwright codegen",
-    "test": "mocha"
+    "test": "playwright test"
   },
   "author": "",
   "license": "ISC",
-  "devDependencies": {
+  "packageManager": "pnpm@9.1.1+sha1.09ada6cd05003e0ced25fb716f9fda4063ec2e3b",
-    "@types/chai": "^4.2.18",
+  "dependencies": {
-    "@types/mocha": "^8.2.2",
+    "@playwright/test": "^1.52.0",
-    "chai": "^4.3.4",
+    "@types/node": "^22.15.16",
-    "mocha": "^8.4.0",
+    "playwright": "^1.52.0",
-    "playwright": "^1.11.1",
+    "typescript": "^5.8.3"
-    "ts-node": "^10.0.0",
-    "typescript": "^4.3.2"
   }
 }

playwright.config.ts

@@ -0,0 +1,42 @@
+import { defineConfig, devices } from '@playwright/test';
+
+export default defineConfig({
+  // Look for test files in the "tests" directory, relative to this configuration file.
+  testDir: 'tests',
+
+  // Run all tests in parallel.
+  fullyParallel: true,
+
+  // Fail the build on CI if you accidentally left test.only in the source code.
+  // forbidOnly: !!process.env.CI,
+
+  // Retry on CI only.
+  // retries: process.env.CI ? 2 : 0,
+
+  // Opt out of parallel tests on CI.
+  // workers: process.env.CI ? 1 : undefined,
+
+  // Reporter to use
+  reporter: 'html',
+
+//   use: {
+//     // Base URL to use in actions like `await page.goto('/')`.
+//     baseURL: 'http://127.0.0.1:3000',
+// 
+//     // Collect trace when retrying the failed test.
+//     trace: 'on-first-retry',
+//   },
+  // Configure projects for major browsers.
+  // projects: [
+  //   {
+  //     name: 'chromium',
+  //     use: { ...devices['Desktop Chrome'] },
+  //   },
+  // ],
+  // Run your local dev server before starting the tests.
+  // webServer: {
+  //   command: 'npm run start',
+  //   url: 'http://127.0.0.1:3000',
+  //   reuseExistingServer: !process.env.CI,
+  // },
+});

pnpm-lock.yaml

@@ -0,0 +1,80 @@
+lockfileVersion: '9.0'
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
+importers:
+
+  .:
+    dependencies:
+      '@playwright/test':
+        specifier: ^1.52.0
+        version: 1.52.0
+      '@types/node':
+        specifier: ^22.15.16
+        version: 22.15.16
+      playwright:
+        specifier: ^1.52.0
+        version: 1.52.0
+      typescript:
+        specifier: ^5.8.3
+        version: 5.8.3
+
+packages:
+
+  '@playwright/test@1.52.0':
+    resolution: {integrity: sha512-uh6W7sb55hl7D6vsAeA+V2p5JnlAqzhqFyF0VcJkKZXkgnFcVG9PziERRHQfPLfNGx1C292a4JqbWzhR8L4R1g==}
+    engines: {node: '>=18'}
+    hasBin: true
+
+  '@types/node@22.15.16':
+    resolution: {integrity: sha512-3pr+KjwpVujqWqOKT8mNR+rd09FqhBLwg+5L/4t0cNYBzm/yEiYGCxWttjaPBsLtAo+WFNoXzGJfolM1JuRXoA==}
+
+  fsevents@2.3.2:
+    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
+    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
+    os: [darwin]
+
+  playwright-core@1.52.0:
+    resolution: {integrity: sha512-l2osTgLXSMeuLZOML9qYODUQoPPnUsKsb5/P6LJ2e6uPKXUdPK5WYhN4z03G+YNbWmGDY4YENauNu4ZKczreHg==}
+    engines: {node: '>=18'}
+    hasBin: true
+
+  playwright@1.52.0:
+    resolution: {integrity: sha512-JAwMNMBlxJ2oD1kce4KPtMkDeKGHQstdpFPcPH3maElAXon/QZeTvtsfXmTMRyO9TslfoYOXkSsvao2nE1ilTw==}
+    engines: {node: '>=18'}
+    hasBin: true
+
+  typescript@5.8.3:
+    resolution: {integrity: sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==}
+    engines: {node: '>=14.17'}
+    hasBin: true
+
+  undici-types@6.21.0:
+    resolution: {integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==}
+
+snapshots:
+
+  '@playwright/test@1.52.0':
+    dependencies:
+      playwright: 1.52.0
+
+  '@types/node@22.15.16':
+    dependencies:
+      undici-types: 6.21.0
+
+  fsevents@2.3.2:
+    optional: true
+
+  playwright-core@1.52.0: {}
+
+  playwright@1.52.0:
+    dependencies:
+      playwright-core: 1.52.0
+    optionalDependencies:
+      fsevents: 2.3.2
+
+  typescript@5.8.3: {}
+
+  undici-types@6.21.0: {}

tests/cad/cd.test.ts

@@ -0,0 +1,54 @@
+import { test, expect } from '@playwright/test';
+
+test('webcad-cd', async ({ page }) => {
+  await page.goto('https://t.cfcad.cn/');
+  await page.getByPlaceholder('请输入您的账号').click();
+  await page.getByPlaceholder('请输入您的账号').fill('zc3');
+  await page.getByPlaceholder('请输入您的账号').press('Tab');
+  await page.getByPlaceholder('请输入您的密码').fill('123456');
+  await page.getByRole('button', { name: '登录' }).click();
+  await page.getByRole('button', { name: '开始设计>>' }).click();
+  await page.getByRole('listitem', { name: '左右侧板 LEFTRIGHTBOARD' }).getByRole('img').click();
+  await page.getByRole('button', { name: '确定' }).click();
+  await page.locator('canvas').nth(1).click({
+    position: {
+      x: 483,
+      y: 381
+    }
+  });
+  await page.getByText('顶底板').click();
+  await page.getByRole('button', { name: '确定' }).click();
+  await page.locator('canvas').nth(1).click({
+    position: {
+      x: 520,
+      y: 377
+    }
+  });
+  await page.getByPlaceholder('请输入命令:').click();
+  await page.getByPlaceholder('请输入命令:').fill('cd');
+  await page.getByPlaceholder('请输入命令:').press('Enter');
+  await page.locator('canvas').nth(1).click({
+    position: {
+      x: 826,
+      y: 447
+    }
+  });
+  await page.locator('canvas').nth(1).click({
+    position: {
+      x: 402,
+      y: 57
+    }
+  });
+  await page.locator('body').press('Enter');
+  await page.frameLocator('iframe').getByRole('cell', { name: '|||' }).click();
+  await page.frameLocator('iframe').locator('td:nth-child(3) > .cell').first().dblclick();
+  await page.frameLocator('iframe').getByRole('button', { name: '下一步' }).click();
+  await page.frameLocator('iframe').getByPlaceholder('请输入内容').nth(1).click();
+  await page.frameLocator('iframe').getByPlaceholder('请输入内容').nth(1).fill('11');
+  await page.frameLocator('iframe').getByPlaceholder('请输入内容').nth(2).click();
+  await page.frameLocator('iframe').getByPlaceholder('请输入内容').nth(2).fill('2222');
+  await page.frameLocator('iframe').locator('#app').click();
+  const page1Promise = page.waitForEvent('popup');
+  await page.frameLocator('iframe').getByRole('button', { name: '保存' }).click();
+  const page1 = await page1Promise;
+});

tests/mes/login.test.ts

@@ -1,9 +1,9 @@
-import { assert } from "chai";
+import { test } from '@playwright/test'
 import { chromium } from "playwright";
 
-describe("mes登录", function () {
+test.describe("mes登录", function () {
 
-    it('login', async function () {
+    test('login', async function () {
         const browser = await chromium.launch({
             // headless: false
         });
@@ -32,13 +32,12 @@ describe("mes登录", function () {
 
         await page.waitForTimeout(1000)
         let path = await page.evaluateHandle(()=>window.location.hash.substr(1))
-        assert.equal('/dashboard',await path.jsonValue());
+        test.expect(await path.jsonValue()).toEqual('/dashboard')
 
-        after(async function(){
+      
+        // ---------------------
         await context.close();
         await browser.close();
-        })
-        // ---------------------
        
     })
 })

tests/pfws/login.test.ts

@@ -1,9 +1,9 @@
-import { assert } from "chai";
+import { test } from '@playwright/test'
 import { chromium } from "playwright";
 
-describe('平台', async function(){
+test.describe('平台', function(){
 
-    it('登陆', async function(){
+    test('登陆', async function(){
 
         const browser = await chromium.launch({
             // headless: false
@@ -29,14 +29,13 @@ describe('平台', async function(){
         await page.click('button:has-text("登录")');
 
         let path = await page.evaluateHandle(()=>window.location.pathname);
-        assert.notEqual('/user-login.html',await path.jsonValue());
+
+        test.expect(await path.jsonValue()).not.toEqual('/user-login.html')
 
         // ---------------------
-        after(async () => {
         await context.close();
         await browser.close();
     })
-    })
 
 
 })

tsconfig.json

@@ -1,72 +1,16 @@
 {
   "compilerOptions": {
     /* Visit https://aka.ms/tsconfig.json to read more about this file */
-
+    "target": "ESNext", 
-    /* Basic Options */
+    "module": "NodeNext",
-    // "incremental": true,                         /* Enable incremental compilation */
+    "moduleResolution": "NodeNext",
-    "target": "es5",                                /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', 'ES2021', or 'ESNEXT'. */
-    "module": "commonjs",                           /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
-    // "lib": [],                                   /* Specify library files to be included in the compilation. */
-    // "allowJs": true,                             /* Allow javascript files to be compiled. */
-    // "checkJs": true,                             /* Report errors in .js files. */
-    // "jsx": "preserve",                           /* Specify JSX code generation: 'preserve', 'react-native', 'react', 'react-jsx' or 'react-jsxdev'. */
-    // "declaration": true,                         /* Generates corresponding '.d.ts' file. */
-    // "declarationMap": true,                      /* Generates a sourcemap for each corresponding '.d.ts' file. */
-    // "sourceMap": true,                           /* Generates corresponding '.map' file. */
-    // "outFile": "./",                             /* Concatenate and emit output to single file. */
-    // "outDir": "./",                              /* Redirect output structure to the directory. */
-    // "rootDir": "./",                             /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
-    // "composite": true,                           /* Enable project compilation */
-    // "tsBuildInfoFile": "./",                     /* Specify file to store incremental compilation information */
-    // "removeComments": true,                      /* Do not emit comments to output. */
-    // "noEmit": true,                              /* Do not emit outputs. */
-    // "importHelpers": true,                       /* Import emit helpers from 'tslib'. */
-    // "downlevelIteration": true,                  /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
-    // "isolatedModules": true,                     /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
-
-    /* Strict Type-Checking Options */
     "strict": true, /* Enable all strict type-checking options. */
-    // "noImplicitAny": true,                       /* Raise error on expressions and declarations with an implied 'any' type. */
-    // "strictNullChecks": true,                    /* Enable strict null checks. */
-    // "strictFunctionTypes": true,                 /* Enable strict checking of function types. */
-    // "strictBindCallApply": true,                 /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
-    // "strictPropertyInitialization": true,        /* Enable strict checking of property initialization in classes. */
-    // "noImplicitThis": true,                      /* Raise error on 'this' expressions with an implied 'any' type. */
-    // "alwaysStrict": true,                        /* Parse in strict mode and emit "use strict" for each source file. */
-
-    /* Additional Checks */
-    // "noUnusedLocals": true,                      /* Report errors on unused locals. */
-    // "noUnusedParameters": true,                  /* Report errors on unused parameters. */
-    // "noImplicitReturns": true,                   /* Report error when not all code paths in function return a value. */
-    // "noFallthroughCasesInSwitch": true,          /* Report errors for fallthrough cases in switch statement. */
-    // "noUncheckedIndexedAccess": true,            /* Include 'undefined' in index signature results */
-    // "noImplicitOverride": true,                  /* Ensure overriding members in derived classes are marked with an 'override' modifier. */
-    // "noPropertyAccessFromIndexSignature": true,  /* Require undeclared properties from index signatures to use element accesses. */
-
-    /* Module Resolution Options */
-    // "moduleResolution": "node",                  /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
-    // "baseUrl": "./",                             /* Base directory to resolve non-absolute module names. */
-    // "paths": {},                                 /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
-    // "rootDirs": [],                              /* List of root folders whose combined content represents the structure of the project at runtime. */
-    // "typeRoots": [],                             /* List of folders to include type definitions from. */
-    // "types": [],                                 /* Type declaration files to be included in compilation. */
-    // "allowSyntheticDefaultImports": true,        /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
     "esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
-    // "preserveSymlinks": true,                    /* Do not resolve the real path of symlinks. */
-    // "allowUmdGlobalAccess": true,                /* Allow accessing UMD globals from modules. */
-
-    /* Source Map Options */
-    // "sourceRoot": "",                            /* Specify the location where debugger should locate TypeScript files instead of source locations. */
-    // "mapRoot": "",                               /* Specify the location where debugger should locate map files instead of generated locations. */
-    // "inlineSourceMap": true,                     /* Emit a single file with source maps instead of having a separate file. */
-    // "inlineSources": true,                       /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
-
-    /* Experimental Options */
-    // "experimentalDecorators": true,              /* Enables experimental support for ES7 decorators. */
-    // "emitDecoratorMetadata": true,               /* Enables experimental support for emitting type metadata for decorators. */
-
     /* Advanced Options */
     "skipLibCheck": true, /* Skip type checking of declaration files. */
     "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
-  }
+  },
+  "include": [
+    "tests/**/*.ts",
+  ]
 }