From 362189d5b747908ca41f18d4adc096d2e9aaff66 Mon Sep 17 00:00:00 2001 From: "Alex.hxy" <1872591453@qq.com> Date: Thu, 12 Dec 2024 10:35:09 +0800 Subject: [PATCH 1/5] feat: update ci to support taro e2e test --- .github/workflows/cypress.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index c08a2059a3..5ede657dc8 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -29,8 +29,7 @@ jobs: CI: true run: pnpm cypress install --force && pnpm e2e:run:h5 - # Taro的自动化测试，demo包管理解决后解除注释 - # - name: Run E2E Tests for Taro - # env: - # CI: true - # pnpm cypress install --force && run: pnpm e2e:run:taro + - name: Run E2E Tests for Taro + env: + CI: true + run: pnpm cypress install --force && pnpm e2e:run:taro From 86c48b8d0407f42b60a9344918ad0fe66d0b02db Mon Sep 17 00:00:00 2001 From: "Alex.hxy" <1872591453@qq.com> Date: Thu, 12 Dec 2024 10:40:26 +0800 Subject: [PATCH 2/5] feat: update ci to support taro e2e test --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 87dc4cdecc..0fca5d2f7d 100644 --- a/package.json +++ b/package.json @@ -89,9 +89,10 @@ "cypress:run:taro": "cypress run --env baseUrl=http://localhost:10086/#/ --spec 'cypress/e2e/taro/index.cy.js'", "cypress:open:taro": "cypress open --env baseUrl=http://localhost:10086/#/ 'cypress/e2e/taro/index.cy.js'", "e2e:run:h5": "start-server-and-test dev http://localhost:5173/ cypress:run", + "e2e:run:h5": "start-server-and-test dev http://localhost:5173/ cypress:run", "e2e:open:h5": "start-server-and-test dev http://localhost:5173/ cypress:open", - "e2e:run:taro": "start-server-and-test dev:taro:h5 http://localhost:10086 cypress:run:taro", - "e2e:open:taro": "start-server-and-test dev:taro:h5 http://localhost:10086 cypress:open:taro", + "e2e:run:taro": "start-server-and-test dev:taro h5 http://localhost:10086 cypress:run:taro", + "e2e:open:taro": "start-server-and-test dev:taro h5 http://localhost:10086 cypress:open:taro", "update:taro:entry": "node ./scripts/rn/update-taro-entry", "upgradeTaro": "pnpm --dir ./packages/nutui-taro-demo upgradeTaro" }, From f4e4d4f9b360cf1c7fe7445bd1f87d354711f9c2 Mon Sep 17 00:00:00 2001 From: "Alex.hxy" <1872591453@qq.com> Date: Thu, 12 Dec 2024 11:01:56 +0800 Subject: [PATCH 3/5] feat: update ci to support taro e2e test --- cypress/e2e/taro/index.cy.js | 1 - package.json | 5 +++-- scripts/rn/update-taro-entry.js | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cypress/e2e/taro/index.cy.js b/cypress/e2e/taro/index.cy.js index 13c04adff4..37754fe207 100644 --- a/cypress/e2e/taro/index.cy.js +++ b/cypress/e2e/taro/index.cy.js @@ -1,4 +1,3 @@ -import { describe } from 'yargs' import { checkTaroBlank } from '../common/pageWhiteTest.cy' describe('All Taro Demos White Page Test', () => { diff --git a/package.json b/package.json index 0fca5d2f7d..c084f4c27c 100644 --- a/package.json +++ b/package.json @@ -58,6 +58,7 @@ "dev:taro:jdrn": "pnpm run clone:rn && pnpm --dir ./packages/nutui-taro-demo dev:jdrn", "dev:taro:rn:dark": "THEME=dark pnpm dev:taro:rn", "dev:taro": "pnpm run update:taro:entry && pnpm --dir ./packages/nutui-taro-demo dev", + "dev:taro:h5": "pnpm dev:taro h5", "dev:jdtaro": "pnpm run update:taro:entry && JD=1 pnpm --dir ./packages/nutui-taro-demo dev", "dev:jdtaro:jdharmonycpp": "pnpm run clone:jdharmony cpp &&pnpm run update:taro:entry && JD=1 pnpm --dir ./packages/nutui-taro-demo dev:jdharmonycpp", "dev:jdtaro:jdharmony": "pnpm run clone:jdharmony && pnpm run update:taro:entry && JD=1 pnpm --dir ./packages/nutui-taro-demo dev:jdharmony", @@ -91,8 +92,8 @@ "e2e:run:h5": "start-server-and-test dev http://localhost:5173/ cypress:run", "e2e:run:h5": "start-server-and-test dev http://localhost:5173/ cypress:run", "e2e:open:h5": "start-server-and-test dev http://localhost:5173/ cypress:open", - "e2e:run:taro": "start-server-and-test dev:taro h5 http://localhost:10086 cypress:run:taro", - "e2e:open:taro": "start-server-and-test dev:taro h5 http://localhost:10086 cypress:open:taro", + "e2e:run:taro": "start-server-and-test dev:taro:h5 http://localhost:10086 cypress:run:taro", + "e2e:open:taro": "start-server-and-test dev:taro:h5 http://localhost:10086 cypress:open:taro", "update:taro:entry": "node ./scripts/rn/update-taro-entry", "upgradeTaro": "pnpm --dir ./packages/nutui-taro-demo upgradeTaro" }, diff --git a/scripts/rn/update-taro-entry.js b/scripts/rn/update-taro-entry.js index e5855ca391..22d1789714 100644 --- a/scripts/rn/update-taro-entry.js +++ b/scripts/rn/update-taro-entry.js @@ -8,6 +8,7 @@ const param = process.env.C // C=radio pnpm dev:taro:jdharmonycpp or C=radio,button,cell pnpm dev:taro:jdharmonycpp function specialComponent(name) { + if(!param) return true const entries = param.split(',').map((i) => i.toLowerCase()) return entries.includes(name.toLowerCase()) } From 33df328c7feca5f3047d174efe2b29015a74bc97 Mon Sep 17 00:00:00 2001 From: "Alex.hxy" <1872591453@qq.com> Date: Thu, 12 Dec 2024 11:08:02 +0800 Subject: [PATCH 4/5] feat: update ci to support taro e2e test --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index c084f4c27c..17ac8e8695 100644 --- a/package.json +++ b/package.json @@ -90,10 +90,9 @@ "cypress:run:taro": "cypress run --env baseUrl=http://localhost:10086/#/ --spec 'cypress/e2e/taro/index.cy.js'", "cypress:open:taro": "cypress open --env baseUrl=http://localhost:10086/#/ 'cypress/e2e/taro/index.cy.js'", "e2e:run:h5": "start-server-and-test dev http://localhost:5173/ cypress:run", - "e2e:run:h5": "start-server-and-test dev http://localhost:5173/ cypress:run", "e2e:open:h5": "start-server-and-test dev http://localhost:5173/ cypress:open", "e2e:run:taro": "start-server-and-test dev:taro:h5 http://localhost:10086 cypress:run:taro", - "e2e:open:taro": "start-server-and-test dev:taro:h5 http://localhost:10086 cypress:open:taro", + "e2e:open:taro": "start-server-and-test dev:taroh5 http://localhost:10086 cypress:open:taro", "update:taro:entry": "node ./scripts/rn/update-taro-entry", "upgradeTaro": "pnpm --dir ./packages/nutui-taro-demo upgradeTaro" }, From a9ec3efdd5714400acdabe5ca9db3b05e5a685e9 Mon Sep 17 00:00:00 2001 From: "Alex.hxy" <1872591453@qq.com> Date: Thu, 12 Dec 2024 11:24:25 +0800 Subject: [PATCH 5/5] feat: update ci to support taro e2e test --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 17ac8e8695..7de2b6ad68 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "e2e:run:h5": "start-server-and-test dev http://localhost:5173/ cypress:run", "e2e:open:h5": "start-server-and-test dev http://localhost:5173/ cypress:open", "e2e:run:taro": "start-server-and-test dev:taro:h5 http://localhost:10086 cypress:run:taro", - "e2e:open:taro": "start-server-and-test dev:taroh5 http://localhost:10086 cypress:open:taro", + "e2e:open:taro": "start-server-and-test dev:taro:h5 http://localhost:10086 cypress:open:taro", "update:taro:entry": "node ./scripts/rn/update-taro-entry", "upgradeTaro": "pnpm --dir ./packages/nutui-taro-demo upgradeTaro" },